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 e433407a4e1676c15d0a3c2016b8f4e034d54c32..fe5341295c55af55d521454ac5ae98b225f1eb32 100644 (file)
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -80,7 +80,7 @@ OPTIONS
        R::     removed/deleted
        C::     modified/changed
        K::     to be killed
-       ?       other
+       ?::     other
 
 --full-name::
        When run from a subdirectory, the command usually