@matheusbsbs / matheus-bagliano / commits / d8ae1d10cd
Fork 0

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>

Junio C Hamano committed Nov 4, 2005 at 18:17 UTC d8ae1d10cd08ff1f0b749222d083446ef7bd8f3f
2 files changed +3 -2
Documentation/merge-pull-opts.txt
+2 -1
@@ -3,7 +3,8 @@
3
4 --no-commit::
5 Perform the merge but pretend the merge failed and do
6 - not autocommit.
6 + not autocommit, to give the user a chance to inspect and
7 + further tweak the merge result before committing.
8
9 -s <strategy>::
10 use that merge strategy; can be given more than once to
git-pull.sh
+1 -1
@@ -7,7 +7,7 @@
7 . git-sh-setup || die "Not a git archive"
8
9 usage () {
10 - die "git pull [-n] [-s strategy]... <repo> <head>..."
10 + die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..."
11 }
12
13 strategy_args= no_summary= no_commit=