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 /ws.c | |
parent | Merge branch 'jn/fast-import-subtree' (diff) | |
parent | rebase: protect against diff.renames configuration (diff) | |
download | tgif-9c74b9440108c88802f656f2fad2e8950a4a7650.tar.xz |
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 'ws.c')
0 files changed, 0 insertions, 0 deletions