X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fmerge-options.txt;h=6bd0b041c3c1c0af5d03fce43d8016706e9256b1;hb=8963314c77af9a4eda5dcbdbab3d4001af83ad81;hp=b613d4ed083d080797f7da90fc92212f98611d07;hpb=033c2dc4364042b9e6dbd44e82e1974f78a72567;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index b613d4ed0..6bd0b041c 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -7,6 +7,12 @@ 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