summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-25 15:46:59 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-25 15:46:59 -0700
commit7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6 (patch)
tree2c6b9415dc1cda4caee36d06c8bfe6e4a188c0a5 /ll-merge.c
parentb00445bc349d6a4d09c8226dd43c60a097d70e27 (diff)
parent2147f844ed13fa5052161d38f8cf7dca6f83c06e (diff)
downloadgit-7b9f29c40f52084c4e3abf7d2a4212c15aa63ae6.tar.gz
Merge branch 'cw/rebase-i-root'
Finishing touches to the "rebase -i --root" (new feature for 1.7.12). * cw/rebase-i-root: rebase -i: handle fixup of root commit correctly
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions