diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:43 -0800 |
| commit | c23cd78e8127a2f80cc0357994209bc1bb81a4fe (patch) | |
| tree | b8f06e459c5ede03d54de4fb27eecb53585799b0 /diff.c | |
| parent | Merge branch 'sc/sequencer-gpg-octopus' (diff) | |
| parent | apply: when -R, also reverse list of sections (diff) | |
| download | git-c23cd78e8127a2f80cc0357994209bc1bb81a4fe.tar.gz git-c23cd78e8127a2f80cc0357994209bc1bb81a4fe.zip | |
Merge branch 'jt/apply-reverse-twice'
"git apply -R" did not handle patches that touch the same path
twice correctly, which has been corrected. This is most relevant
in a patch that changes a path from a regular file to a symbolic
link (and vice versa).
* jt/apply-reverse-twice:
apply: when -R, also reverse list of sections
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions