summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-22 13:00:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-22 13:00:55 -0700
commit07873ca7b02a06d3f5a9db47333062aff6f18047 (patch)
treeb7420a5143ec6c3e09a2c4e7853ef7da243da925 /mergetools
parentMerge branch 'js/fast-export-paths-with-spaces' into maint (diff)
parentadd test case for rebase of empty commit (diff)
downloadtgif-07873ca7b02a06d3f5a9db47333062aff6f18047.tar.xz
Merge branch 'mz/empty-rebase-test' into maint
We did not have test to make sure "git rebase" without extra options filters out an empty commit in the original history. * mz/empty-rebase-test: add test case for rebase of empty commit
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions