Document the --no-commit flag better

Pasky and I did overlapping documentation independently; this is to pick up better wordings from what he sent me. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
19 years ago · d8ae1d10cd
2 changed files with 3 additions and 2 deletions
--- a/Documentation/merge-pull-opts.txt
+++ b/Documentation/merge-pull-opts.txt
@ -3,7 +3,8 @@
				@@ -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
--- a/git-pull.sh
+++ b/git-pull.sh
@ -7,7 +7,7 @@
				@@ -7,7 +7,7 @@
 . git-sh-setup || die "Not a git archive"

 usage () {
-    die "git pull [-n] [-s strategy]... <repo> <head>..."
+    die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
 }

 strategy_args= no_summary= no_commit=