diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-02-14 12:57:17 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-14 12:57:17 -0800 |
| commit | 3c1e0d6a79ed9028d165056afa24af9960dac688 (patch) | |
| tree | 8a814cb58b8d396b9764ee303a5e32c05424bb4e | |
| parent | a49060324a5470f1722a24efebae81c0e6ff042a (diff) | |
| parent | 8580830084c8917ac41d18e39dba276b237f598e (diff) | |
| download | git-3c1e0d6a79ed9028d165056afa24af9960dac688.tar.gz | |
Merge branch 'lt/pull-no-edit'
* lt/pull-no-edit:
"git pull" doesn't know "--edit"
| -rwxr-xr-x | git-pull.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index d8b64d7a67..434c139f07 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -40,7 +40,7 @@ test -f "$GIT_DIR/MERGE_HEAD" && die_merge strategy_args= diffstat= no_commit= squash= no_ff= ff_only= log_arg= verbosity= progress= recurse_submodules= -merge_args= +merge_args= edit= curr_branch=$(git symbolic-ref -q HEAD) curr_branch_short="${curr_branch#refs/heads/}" rebase=$(git config --bool branch.$curr_branch_short.rebase) @@ -70,6 +70,10 @@ do no_commit=--no-commit ;; --c|--co|--com|--comm|--commi|--commit) no_commit=--commit ;; + -e|--edit) + edit=--edit ;; + --no-edit) + edit=--no-edit ;; --sq|--squ|--squa|--squas|--squash) squash=--squash ;; --no-sq|--no-squ|--no-squa|--no-squas|--no-squash) @@ -278,7 +282,7 @@ true) eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}" ;; *) - eval="git-merge $diffstat $no_commit $squash $no_ff $ff_only" + eval="git-merge $diffstat $no_commit $edit $squash $no_ff $ff_only" eval="$eval $log_arg $strategy_args $merge_args $verbosity $progress" eval="$eval \"\$merge_name\" HEAD $merge_head" ;; |