diff options
Diffstat (limited to 'Documentation/git-merge.txt')
| -rw-r--r-- | Documentation/git-merge.txt | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 615e6bacde..3c6927b1fb 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -72,12 +72,6 @@ include::merge-options.txt[] agrees to a Developer Certificate of Origin (see http://developercertificate.org/ for more information). --S[<keyid>]:: ---gpg-sign[=<keyid>]:: - 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 case one is created). @@ -141,7 +135,7 @@ exception is when the changed index entries are in the state that would result from the merge already.) If all named commits are already ancestors of `HEAD`, 'git merge' -will exit early with the message "Already up-to-date." +will exit early with the message "Already up to date." FAST-FORWARD MERGE ------------------ |