projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 73af6a4 b0f266d)
Merge branch 'jt/apply-reverse-twice'
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 Nov 2020 21:17:43 +0000 (13:17 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 Nov 2020 21:17:43 +0000 (13:17 -0800)
commitc23cd78e8127a2f80cc0357994209bc1bb81a4fe
treeb8f06e459c5ede03d54de4fb27eecb53585799b0tree | snapshot
parent73af6a4fab3fc570e234f5836dc1e59c3270a716commit | diff
parentb0f266de11e9dc3a140ff9407a47604bef0e257fcommit | diff
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
Unnamed repository; edit this file 'description' to name the repository.