diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2008-08-21 14:14:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-21 23:37:38 -0700 |
| commit | 4be636f42cd75f865204817c307eb1a7b464109c (patch) | |
| tree | 98b775fd6b8a72e4d5f7f4de21f1461ffaa71794 /t/t4013/diff.diff_initial..side | |
| parent | Make reflog query '@{1219188291}' act as '@{2008.8.19.16:24:51.-0700}' (diff) | |
| download | git-4be636f42cd75f865204817c307eb1a7b464109c.tar.gz git-4be636f42cd75f865204817c307eb1a7b464109c.zip | |
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>
Diffstat (limited to 't/t4013/diff.diff_initial..side')
0 files changed, 0 insertions, 0 deletions