From: Junio C Hamano Date: Sat, 5 Nov 2005 02:17:16 +0000 (-0800) Subject: Document the --no-commit flag better X-Git-Tag: v0.99.9d^2~7 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d8ae1d10cd08ff1f0b749222d083446ef7bd8f3f;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/Documentation/merge-pull-opts.txt b/Documentation/merge-pull-opts.txt index d03fd1617..d9164a04a 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 :: use that merge strategy; can be given more than once to diff --git a/git-pull.sh b/git-pull.sh index 96016270b..e23d4f559 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -7,7 +7,7 @@ . git-sh-setup || die "Not a git archive" usage () { - die "git pull [-n] [-s strategy]... ..." + die "git pull [-n] [--no-commit] [-s strategy]... ..." } strategy_args= no_summary= no_commit=