diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-04 18:17:16 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-04 18:17:16 -0800 |
| commit | d8ae1d10cd08ff1f0b749222d083446ef7bd8f3f (patch) | |
| tree | a5cb0871a568315a0277ca028c6f330ab704992f | |
| parent | Documentation: -merge and -pull: describe merge strategies. (diff) | |
| download | tgif-d8ae1d10cd08ff1f0b749222d083446ef7bd8f3f.tar.xz | |
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>
| -rw-r--r-- | Documentation/merge-pull-opts.txt | 3 | ||||
| -rwxr-xr-x | git-pull.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/merge-pull-opts.txt b/Documentation/merge-pull-opts.txt index d03fd16178..d9164a04a6 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 diff --git a/git-pull.sh b/git-pull.sh index 96016270b4..e23d4f5597 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]... <repo> <head>..." + die "git pull [-n] [--no-commit] [-s strategy]... <repo> <head>..." } strategy_args= no_summary= no_commit= |