X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=Documentation%2Fmerge-pull-opts.txt;h=d9164a04a6fceb4c34965f10aa2ae12d2278bce5;hb=90279074ca5cc336a8bfffd47d19d089b291b432;hp=d03fd16178e8b687485afefb2f31617ddb77bd5e;hpb=3746501664e3fcf6c44080cb599b50bf9cbea2be;p=git.git

diff --git a/Documentation/merge-pull-opts.txt b/Documentation/merge-pull-opts.txt
index d03fd161..d9164a04 100644
--- a/Documentation/merge-pull-opts.txt
+++ b/Documentation/merge-pull-opts.txt
@@ -3,7 +3,8 @@
 
 --no-commit::
 	Perform the merge but pretend the merge failed and do
-	not autocommit.
+	not autocommit, to give the user a chance to inspect and
+	further tweak the merge result before committing.
 
 -s <strategy>::
 	use that merge strategy; can be given more than once to