diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-03 15:45:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-03 15:45:36 -0800 |
| commit | 6ddc0964034342519a87fe013781abf31c6db6ad (patch) | |
| tree | 74cc863556a42d41e2bf8dec45e6fd33ed312228 /git-pull.sh | |
| parent | 235d521da60e4699e5bd59ac658b5b48bd76ddca (diff) | |
| parent | 2be8fd085e865097fa0908fe1a94c8edf9cde7f5 (diff) | |
GIT 0.99.9cv0.99.9c
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index d4765188b4..96016270b4 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -10,13 +10,15 @@ usage () { die "git pull [-n] [-s strategy]... <repo> <head>..." } -strategy_args= no_summary= +strategy_args= no_summary= no_commit= while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac do case "$1" in -n|--n|--no|--no-|--no-s|--no-su|--no-sum|--no-summ|\ --no-summa|--no-summar|--no-summary) no_summary=-n ;; + --no-c|--no-co|--no-com|--no-comm|--no-commi|--no-commit) + no_commit=--no-commit ;; -s=*|--s=*|--st=*|--str=*|--stra=*|--strat=*|--strate=*|\ --strateg=*|--strategy=*|\ -s|--s|--st|--str|--stra|--strat|--strate|--strateg|--strategy) @@ -81,4 +83,4 @@ case "$strategy_args" in esac merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") -git-merge $no_summary $strategy_args "$merge_name" HEAD $merge_head +git-merge $no_summary $no_commit $strategy_args "$merge_name" HEAD $merge_head |