diff options
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-pull.sh b/git-pull.sh index bfeb4a0ff6..502af1a9c4 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -216,7 +216,7 @@ fi merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit test true = "$rebase" && - exec git-rebase $diffstat $strategy_args --onto $merge_head \ + exec git rebase $diffstat $strategy_args --onto $merge_head \ ${oldremoteref:-$merge_head} -exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ - "$merge_name" HEAD $merge_head $verbosity +exec git merge $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ + -m "$merge_name" $merge_head |