diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-20 12:53:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-20 12:53:08 -0700 |
| commit | 09c6a8e66cfe51400e6e7d5086266195c7ef62bf (patch) | |
| tree | ccef1948bd362902e625d5070384bfcb57ef2548 /git-merge-octopus.sh | |
| parent | 1e627881465dbb47eeea85aa729dd4261216ff1b (diff) | |
| parent | 840b3ca758a42cb1481259521126ba2b02a5447a (diff) | |
| download | git-09c6a8e66cfe51400e6e7d5086266195c7ef62bf.tar.gz | |
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
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions