| commit | 4be636f42cd75f865204817c307eb1a7b464109c | |
| author | Paolo Bonzini <bonzini@gnu.org> | |
| Thu, 21 Aug 2008 12:14:18 +0000 (21 14:14 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 22 Aug 2008 06:37:38 +0000 (21 23:37 -0700) | ||
| tree | 98b775fd6b8a72e4d5f7f4de21f1461ffaa71794 | treesnapshot (tar.gz zip) |
| parent | ea360dd0538d03d25f512efe2f100beb3e7c2130 | commitdiff |
provide more errors for the "merge into empty head" case
A squash merge into an unborn branch could be implemented by building the
index from the merged-from branch, and doing a single commit, but this is
not supported yet.
A non-fast-forward merge into an unborn branch does not make any sense,
because you cannot make a merge commit if you don't have a commit to use
as the parent.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
A squash merge into an unborn branch could be implemented by building the
index from the merged-from branch, and doing a single commit, but this is
not supported yet.
A non-fast-forward merge into an unborn branch does not make any sense,
because you cannot make a merge commit if you don't have a commit to use
as the parent.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-merge.c | diffblobblamehistory |