Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2022-02-02 05:37:34 +0300
committerJunio C Hamano <gitster@pobox.com>2022-02-02 21:02:28 +0300
commit95433eeed9eac439eb21eb30105354b15e71302e (patch)
tree7eda4d13eb4ff66943c75658774038eea4f9ac8e /merge-ort.h
parent6054d1aac36d5769461fb73b15326a900e53edb9 (diff)
diff: add ability to insert additional headers for paths
When additional headers are provided, we need to * add diff_filepairs to diff_queued_diff for each paths in the additional headers map which, unless that path is part of another diff_filepair already found in diff_queued_diff * format the headers (colorization, line_prefix for --graph) * make sure the various codepaths that attempt to return early if there are "no changes" take into account the headers that need to be shown. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-ort.h')
0 files changed, 0 insertions, 0 deletions