Merge branch 'tb/ci-run-cocci-with-18.04' into maint

[thirdparty/git.git] / Documentation / git-for-each-ref.txt

diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 616ce460872f0f93ff5944a36bb0b0a20920485d..2962f85a502a341cc3fa899ca167445fb0c6b320 100644 (file)
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
                   [(--sort=<key>)...] [--format=<format>] [<pattern>...]
                   [--points-at=<object>]
-                  (--merged[=<object>] | --no-merged[=<object>])
+                  [--merged[=<object>]] [--no-merged[=<object>]]
                   [--contains[=<object>]] [--no-contains[=<object>]]
 
 DESCRIPTION
@@ -76,13 +76,11 @@ OPTIONS
 
 --merged[=<object>]::
        Only list refs whose tips are reachable from the
-       specified commit (HEAD if not specified),
-       incompatible with `--no-merged`.
+       specified commit (HEAD if not specified).
 
 --no-merged[=<object>]::
        Only list refs whose tips are not reachable from the
-       specified commit (HEAD if not specified),
-       incompatible with `--merged`.
+       specified commit (HEAD if not specified).
 
 --contains[=<object>]::
        Only list refs which contain the specified commit (HEAD if not
@@ -408,6 +406,11 @@ Note also that multiple copies of an object may be present in the object
 database; in this case, it is undefined which copy's size or delta base
 will be reported.
 
+NOTES
+-----
+
+include::ref-reachability-filters.txt[]
+
 SEE ALSO
 --------
 linkgit:git-show-ref[1]