![[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) |
* 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| git-rebase.sh | patch | | diff1 | | diff2 | | blob | history |
| t/test-lib.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-rebase.sh
Simple merge
diff --cc t/test-lib.sh
Simple merge