fmt-merge-msg: say which branch things were merged into unless 'master'

diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 186f3bb57a6d77da9705860d730cf8cd3c9d867f..fe5341295c55af55d521454ac5ae98b225f1eb32 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -46,6 +46,10 @@ OPTIONS
 -s|--stage::
        Show stage files in the output
 
+--directory::
+       If a whole directory is classified as "other", show just its
+       name (with a trailing slash) and not its whole contents.
+
 -u|--unmerged::
        Show unmerged files in the output (forces --stage)
 
@@ -74,9 +78,9 @@ OPTIONS
        H::     cached
        M::     unmerged
        R::     removed/deleted
-       C::     modifed/changed
+       C::     modified/changed
        K::     to be killed
-       ?       other
+       ?::     other
 
 --full-name::
        When run from a subdirectory, the command usually