| commit | adc7052bb6e737cec0c6702f8dde259540eab672 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 May 2012 22:45:35 +0000 (20 15:45 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 20 May 2012 22:45:35 +0000 (20 15:45 -0700) | ||
| tree | 9a3bfa9ff1389908213adcbddedfa09bf8b88c7b | treesnapshot (tar.gz zip) |
| parent | 9de96815493b577ae791d5113a3e354142ffbcae | commitdiff |
| parent | cb8ad289c6b3f774e6e4431a08eb585eadbb8dad | commitdiff |
Merge branch 'maint'
By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
Consistently use "superproject" instead of "supermodule"
t3404: begin "exchange commits with -p" test with correct preconditions
By Jens Lehmann (1) and Johannes Sixt (1)
* maint:
Consistently use "superproject" instead of "supermodule"
t3404: begin "exchange commits with -p" test with correct preconditions
| t/t3404-rebase-interactive.sh | diff1 | diff2 | blobhistory |
| unpack-trees.c | diff1 | diff2 | blobhistory |