diff options
| -rw-r--r-- | builtin-merge.c | 6 | ||||
| -rwxr-xr-x | git-pull.sh | 6 |
2 files changed, 3 insertions, 9 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 56a1bb651..f1c84d759 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -796,11 +796,6 @@ static int suggest_conflicts(void) return 1; } -static const char deprecation_warning[] = - "'git merge <msg> HEAD <commit>' is deprecated. Please update\n" - "your script to use 'git merge -m <msg> <commit>' instead.\n" - "In future versions of git, this syntax will be removed."; - static struct commit *is_old_style_invocation(int argc, const char **argv) { struct commit *second_token = NULL; @@ -814,7 +809,6 @@ static struct commit *is_old_style_invocation(int argc, const char **argv) die("'%s' is not a commit", argv[1]); if (hashcmp(second_token->object.sha1, head)) return NULL; - warning(deprecation_warning); } return second_token; } diff --git a/git-pull.sh b/git-pull.sh index 502af1a9c..bfeb4a0ff 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 $verbosity $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ - -m "$merge_name" $merge_head +exec git-merge $diffstat $no_commit $squash $no_ff $ff_only $log_arg $strategy_args \ + "$merge_name" HEAD $merge_head $verbosity |