| commit | 7c48b27822b280222be1df7ec9f9e98d688f933b | |
| author | Elijah Newren <newren@gmail.com> | |
| Sat, 18 Jun 2022 00:20:58 +0000 (18 00:20 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 22 Jun 2022 23:10:06 +0000 (22 16:10 -0700) | ||
| tree | 0d2a9f250d1d1a0671bec02ed630bef9877e940e | treesnapshot (tar.gz zip) |
| parent | de90581141a886a79cccd0d9adb76814f3e1ab2c | commitdiff |
merge-tree: allow `ls-files -u` style info to be NUL terminated
Much as `git ls-files` has a -z option, let's add one to merge-tree so
that the conflict-info section can be NUL terminated (and avoid quoting
of unusual filenames).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Much as `git ls-files` has a -z option, let's add one to merge-tree so
that the conflict-info section can be NUL terminated (and avoid quoting
of unusual filenames).
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge-tree.txt | diffblobblamehistory | |
| builtin/merge-tree.c | diffblobblamehistory | |
| t/t4301-merge-tree-write-tree.sh | diffblobblamehistory |