diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:16:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:16:31 -0700 |
| commit | 9c74b9440108c88802f656f2fad2e8950a4a7650 (patch) | |
| tree | c5acfee167d5112fd2eb5c77628064bfb9593ce3 /rerere.h | |
| parent | ebb561bcfc7f04b3122150821dde7aca0356f00c (diff) | |
| parent | 840b3ca758a42cb1481259521126ba2b02a5447a (diff) | |
| download | git-9c74b9440108c88802f656f2fad2e8950a4a7650.tar.gz | |
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
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions