diff options
| author |  Chris Webb <chris@arachsys.com> | 2012-07-24 13:17:03 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-07-24 09:03:33 -0700 |
| commit | 2147f844ed13fa5052161d38f8cf7dca6f83c06e (patch) | |
| tree | 6842a14d47b281ce5bc8f3ade1f0589485c35bf5 /xdiff/xinclude.h | |
| parent | t3404: make test 57 work with dash and others (diff) | |
| download | tgif-2147f844ed13fa5052161d38f8cf7dca6f83c06e.tar.xz | |
rebase -i: handle fixup of root commit correctly
There is a bug with git rebase -i --root when a fixup or squash line is
applied to the new root. We attempt to amend the commit onto which they
apply with git reset --soft HEAD^ followed by a normal commit. Unlike a
real commit --amend, this sequence will fail against a root commit as it
has no parent.
Fix rebase -i to use commit --amend for fixup and squash instead, and
add a test for the case of a fixup of the root commit.
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xinclude.h')
0 files changed, 0 insertions, 0 deletions