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;
die("'%s' is not a commit", argv[1]);
if (hashcmp(second_token->object.sha1, head))
return NULL;
- warning(deprecation_warning);
}
return second_token;
}
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