summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2022-01-28 12:02:49 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2022-01-28 10:18:17 -0800
commit4d4d4eaa7b7f7ceda0648273ad33b71fc68e36c1 (patch)
tree63df22d4a47d63a8fa0951f24d9d5efe498d1611 /builtin/merge-index.c
parentdocs(diff): lose incorrect claim about `diff-files --diff-filter=A` (diff)
downloadtgif-4d4d4eaa7b7f7ceda0648273ad33b71fc68e36c1.tar.xz
diff.c: move the diff filter bits definitions up a bit
This prepares for a more careful handling of the `--diff-filter` options over the next few commits. This commit is best viewed with `--color-moved`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions