| commit | b7482fc333a6dd45b43c68d82f89535bfb9f0531 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 May 2012 20:08:39 +0000 (18 13:08 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 May 2012 20:08:39 +0000 (18 13:08 -0700) | ||
| tree | 1e3ed74320cff1041bf0afd54837a3552daff157 | treesnapshot (tar.gz zip) |
| parent | 2f17ac8b5940a98df8ece113d9363bf6aa39463a | commitdiff |
| parent | 9ef5b2bd166aa390778d7dcda58714ee222d7377 | commitdiff |
Merge branch 'js/rebase-i-p-test-fix' into next
By Johannes Sixt
* js/rebase-i-p-test-fix:
Fix t3411.3 to actually rebase something
By Johannes Sixt
* js/rebase-i-p-test-fix:
Fix t3411.3 to actually rebase something
| t/t3411-rebase-preserve-around-merges.sh | diff1 | diff2 | blobhistory |