diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:54:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-02 15:54:06 -0700 |
| commit | 1197c2298bd47c7046b57d92df2fd055051fbe99 (patch) | |
| tree | 0bd075b22384b0c68bf340097e9a2f0d57740bae /builtin/merge.c | |
| parent | Merge branch 'nd/clone-local-with-colon' (diff) | |
| parent | merge: use help_unknown_ref() (diff) | |
| download | tgif-1197c2298bd47c7046b57d92df2fd055051fbe99.tar.xz | |
Merge branch 'vv/help-unknown-ref'
Detect "git merge foo" that might have meant "git merge origin/foo"
and give an error message that is more specific than "foo is not
something we can merge".
* vv/help-unknown-ref:
merge: use help_unknown_ref()
help: add help_unknown_ref()
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 3e2daa37c3..2ebe732896 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1054,7 +1054,8 @@ static struct commit_list *collect_parents(struct commit *head_commit, for (i = 0; i < argc; i++) { struct commit *commit = get_merge_parent(argv[i]); if (!commit) - die(_("%s - not something we can merge"), argv[i]); + help_unknown_ref(argv[i], "merge", + "not something we can merge"); remotes = &commit_list_insert(commit, remotes)->next; } *remotes = NULL; |