diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-01 19:30:11 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-03 14:55:10 -0800 |
| commit | 123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8 (patch) | |
| tree | 94780e95e47f6ca7f89c2a2b1e46671178583ed6 /git-pull.sh | |
| parent | a3114b3428595710d4719dd668531210af5993c9 (diff) | |
| download | git-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.tar.gz git-123ee3ca7b57c32bb3ecd8cfede20dbb9dd5a8a8.tar.xz | |
Add --no-commit to git-merge/git-pull.
With --no-commit flag, git-pull will perform the merge but pretends as
if the merge needed a hand resolve even if automerge cleanly resolves,
to give the user a chance to add further changes and edit the commit
message.
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 d4765188b..96016270b 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 |