diff options
| author | Elijah Newren <newren@gmail.com> | 2022-06-18 00:20:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-22 16:10:06 -0700 |
| commit | de90581141a886a79cccd0d9adb76814f3e1ab2c (patch) | |
| tree | 78f5313b9c5c1bd2afb3da9c1a334e54059b6dea /commit-graph.c | |
| parent | merge-ort: store more specific conflict information (diff) | |
| download | git-de90581141a886a79cccd0d9adb76814f3e1ab2c.tar.gz git-de90581141a886a79cccd0d9adb76814f3e1ab2c.zip | |
merge-ort: optionally produce machine-readable output
With the new `detailed` parameter, a new mode can be triggered when
displaying the merge messages: The `detailed` mode prints NUL-delimited
fields of the following form:
<path-count> NUL <path>... NUL <conflict-type> NUL <message>
The `<path-count>` field determines how many `<path>` fields there are.
The intention of this mode is to support server-side operations, where
worktree-less merges can lead to conflicts and depending on the type
and/or path count, the caller might know how to handle said conflict.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions