diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-10-18 13:53:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-18 13:53:48 -0700 |
| commit | 82c41a9bfc843aa2a6e286bcb917b0436714ebd4 (patch) | |
| tree | feaa3599c95da8400b179a5618443c66125ee3c6 /Documentation | |
| parent | 6c2bec96a8215bad7745d559c631e45332c5a9ee (diff) | |
| parent | 5f737ac91bd869e65bff401ad1108581ac504e22 (diff) | |
| download | git-82c41a9bfc843aa2a6e286bcb917b0436714ebd4.tar.gz | |
Merge branch 'maint'
* maint:
git-merge: document the -S option
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-merge.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index a74c3713c6..439545926e 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 the resulting merge commit. + -m <msg>:: Set the commit message to be used for the merge commit (in case one is created). |