path: root/Documentation/git-merge.txt
diff options
authorMatthieu Moy <>2015-09-19 07:47:50 (GMT)
committerJunio C Hamano <>2015-09-21 17:48:23 (GMT)
commit2b594bf90d84fd96f2b1fe904c1e62e391ceb4a0 (patch)
tree959671d4d95361422d5bc1952d43e749214df32b /Documentation/git-merge.txt
parent318ca61531d3189aef7b32a924518db1dd9f3374 (diff)
Documentation: explain optional arguments better
Improve the documentation of commands taking optional arguments in two ways: * Documents the behavior of '-O' (for grep) and '-S' (for commands creating commits) when used without the optional argument. * Document the syntax of these options. For the second point, the behavior is documented in gitcli(7), but it is easy for users to miss, and hard for the same user to understand why e.g. "git status -u no" does not work. Document this explicitly in the documentation of each short option having an optional argument: they are the most error prone since there is no '=' sign between the option and its argument. Signed-off-by: Matthieu Moy <> Reviewed-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'Documentation/git-merge.txt')
1 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 61d43a7..c06c4f2 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -67,7 +67,9 @@ include::merge-options.txt[]
- GPG-sign the resulting merge commit.
+ GPG-sign the resulting merge commit. The `keyid` argument is
+ optional and defaults to the committer identity; if specified,
+ it must be stuck to the option without a space.
-m <msg>::
Set the commit message to be used for the merge commit (in