[PATCH] git-merge: document the -S option
- From
Nicolas Vigier <boklm@mars-attacks.org>
- Date
- Oct 14, 2013, 23:41 UTC
- Message-ID
- <1381794065-6657-1-git-send-email-boklm@mars-attacks.org>
The option to gpg sign a merge commit is available but was not documented. Use wording from the git-commit(1) manpage.
Signed-off-by: Nicolas Vigier <boklm@mars-attacks.org> --- Documentation/git-merge.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a74c371..c7915a6 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] - [-s <strategy>] [-X <strategy-option>] + [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] [--[no-]rerere-autoupdate] [-m <msg>] [<commit>...] 'git merge' <msg> HEAD <commit>... 'git merge' --abort @@ -65,6 +65,10 @@ OPTIONS ------- include::merge-options.txt[] +-S[<keyid>]:: +--gpg-sign[=<keyid>]:: + GPG-sign commit. + -m <msg>:: Set the commit message to be used for the merge commit (in case one is created).
-- 1.8.4