Andrew's git / gitweb.git / diff
?
Merge branch 'jn/rebase-rename-am' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:08 +0000 (12:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Aug 2010 19:53:08 +0000 (12:53 -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

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