X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=1a5c12e3171ab82f489bcd53657c8a89741a3dab;hb=b5c12797b442ddf4256332fe4baf709f90bb57a5;hp=b613d4ed083d080797f7da90fc92212f98611d07;hpb=0814d6e554c45636f41856cc2204abe2f661560c;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index b613d4ed0..1a5c12e31 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -7,6 +7,11 @@ With --no-commit perform the merge but pretend the merge
 failed and do not autocommit, to give the user a chance to
 inspect and further tweak the merge result before committing.
 
+--edit::
+-e::
+	Invoke editor before committing successful merge to further
+	edit the default merge message.
+
 --ff::
 --no-ff::
 	Do not generate a merge commit if the merge resolved as