]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 947604d 28d1122)
Merge branch 'jk/add-p-unmerged-fix'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:13 +0000 (15:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Mar 2023 22:03:13 +0000 (15:03 -0700)
commita9f4a01760fae8b8ee47068120f218c983d3f215
tree990808209a85ceacb7415567b7a04d88b1fb2941tree | snapshot
parent947604ddb7fffd6be6aa34192360ec338079dd6acommit | diff
parent28d1122f9ca41a688aded33835bcb4740d1d5d8ccommit | diff
Merge branch 'jk/add-p-unmerged-fix'

"git add -p" while the index is unmerged sometimes failed to parse
the diff output it internally produces and died, which has been
corrected.

* jk/add-p-unmerged-fix:
  add-patch: handle "* Unmerged path" lines
add-patch.c diff1 | diff2 | blob | history
t/t3701-add-interactive.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.