From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:36:30 +0000 (-0700)
Subject: Merge branch 'rh/merge-options-doc-fix' into maint
X-Git-Tag: v1.8.3.3~17
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/15afe9596c101d00085830c54fdc4c4ad0b7193e?ds=inline;hp=-c

Merge branch 'rh/merge-options-doc-fix' into maint

* rh/merge-options-doc-fix:
Documentation/merge-options.txt: restore `-e` option
---

15afe9596c101d00085830c54fdc4c4ad0b7193e
diff --combined Documentation/merge-options.txt
index 2adccf8fec,f192cd2e16..afba8d4f3b
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@@ -8,12 -8,13 +8,13 @@@ failed and do not autocommit, to give t
  inspect and further tweak the merge result before committing.
  
  --edit::
+ -e::
  --no-edit::
  	Invoke an editor before committing successful mechanical merge to
  	further edit the auto-generated merge message, so that the user
  	can explain and justify the merge. The `--no-edit` option can be
  	used to accept the auto-generated message (this is generally
- 	discouraged). The `--edit` option is still useful if you are
+ 	discouraged). The `--edit` (or `-e`) option is still useful if you are
  	giving a draft message with the `-m` option from the command line
  	and want to edit it in the editor.
  +
@@@ -84,11 -85,6 +85,11 @@@ option can be used to override --squash
  	Pass merge strategy specific option through to the merge
  	strategy.
  
 +--verify-signatures::
 +--no-verify-signatures::
 +	Verify that the commits being merged have good and trusted GPG signatures
 +	and abort the merge in case they do not.
 +
  --summary::
  --no-summary::
  	Synonyms to --stat and --no-stat; these are deprecated and will be