diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-03-19 15:03:13 -0700 |
| commit | a9f4a01760fae8b8ee47068120f218c983d3f215 (patch) | |
| tree | 990808209a85ceacb7415567b7a04d88b1fb2941 /commit.c | |
| parent | 947604ddb7fffd6be6aa34192360ec338079dd6a (diff) | |
| parent | 28d1122f9ca41a688aded33835bcb4740d1d5d8c (diff) | |
| download | git-a9f4a01760fae8b8ee47068120f218c983d3f215.tar.gz | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions