1. Stefan Saasen
  2. git


Junio C Hamano  committed d8ae1d1

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>

  • Participants
  • Parent commits 3746501
  • Branches master

Comments (0)

Files changed (2)

File Documentation/merge-pull-opts.txt

View file
  • Ignore whitespace
 	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

File git-pull.sh

View file
  • Ignore whitespace
 . 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=