![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Aug 2010 19:53:08 +0000 (12:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 20 Aug 2010 19:53:08 +0000 (12:53 -0700) | ||
| commit | 09c6a8e66cfe51400e6e7d5086266195c7ef62bf | |
| tree | ccef1948bd362902e625d5070384bfcb57ef2548 | tree | snapshot |
| parent | 1e627881465dbb47eeea85aa729dd4261216ff1b | commit | diff |
| parent | 840b3ca758a42cb1481259521126ba2b02a5447a | commit | diff |
Merge branch 'jn/rebase-rename-am' into maint
* 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 |