X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fmerge-options.txt;h=b613d4ed083d080797f7da90fc92212f98611d07;hb=113e828d3893f31ef72dd8287e95da9fa2287110;hp=e33e0f8e110879a0cd6fe81d97ee6044290e5cfa;hpb=b7f6afe2df4f15e03b02217dbe4f2df182308d10;p=git.git

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e33e0f8e1..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
@@ -75,9 +80,17 @@ option can be used to override --squash.
 ifndef::git-pull[]
 -q::
 --quiet::
-	Operate quietly.
+	Operate quietly. Implies --no-progress.
 
 -v::
 --verbose::
 	Be verbose.
+
+--progress::
+--no-progress::
+	Turn progress on/off explicitly. If neither is specified,
+	progress is shown if standard error is connected to a terminal.
+	Note that not all merge strategies may support progress
+	reporting.
+
 endif::git-pull[]