![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:16:31 +0000 (12:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 18 Aug 2010 19:16:31 +0000 (12:16 -0700) | ||
| commit | 9c74b9440108c88802f656f2fad2e8950a4a7650 | |
| tree | c5acfee167d5112fd2eb5c77628064bfb9593ce3 | tree | snapshot |
| parent | ebb561bcfc7f04b3122150821dde7aca0356f00c | commit | diff |
| parent | 840b3ca758a42cb1481259521126ba2b02a5447a | commit | diff |
Merge branch 'jn/rebase-rename-am'
* jn/rebase-rename-am:
rebase: protect against diff.renames configuration
t3400 (rebase): whitespace cleanup
Teach "apply --index-info" to handle rename patches
t4150 (am): futureproof against failing tests
t4150 (am): style fix
* jn/rebase-rename-am:
rebase: protect against diff.renames configuration
t3400 (rebase): whitespace cleanup
Teach "apply --index-info" to handle rename patches
t4150 (am): futureproof against failing tests
t4150 (am): style fix
| git-rebase.sh | diff1 | | diff2 | | blob | history |
| t/test-lib.sh | diff1 | | diff2 | | blob | history |