mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Document the --no-commit flag better

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-11-04 18:17:16 -08:00
parent 3746501664
commit d8ae1d10cd
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/merge-pull-opts.txt
View File

@ -3,7 +3,8 @@
--no-commit:: --no-commit::
Perform the merge but pretend the merge failed and do 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>:: -s <strategy>::
use that merge strategy; can be given more than once to use that merge strategy; can be given more than once to

2
git-pull.sh
View File

@ -7,7 +7,7 @@
. git-sh-setup || die "Not a git archive" . git-sh-setup || die "Not a git archive"
usage () { 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= strategy_args= no_summary= no_commit=