summaryrefslogtreecommitdiffstats
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-07-16 01:29:44 +0200
committerJunio C Hamano <gitster@pobox.com>2020-07-16 01:29:44 +0200
commit1863dbdde9dfcea3c51940cc106b699dedbebff8 (patch)
tree045f5411d2fa96f810aa11e1c4f93176644a4142 /xdiff-interface.h
parentMerge branch 'sg/commit-graph-progress-fix' into master (diff)
parentgit-diff.txt: reorder possible usages (diff)
downloadgit-1863dbdde9dfcea3c51940cc106b699dedbebff8.tar.xz
git-1863dbdde9dfcea3c51940cc106b699dedbebff8.zip
Merge branch 'ct/diff-with-merge-base-clarification' into master
Doc update. * ct/diff-with-merge-base-clarification: git-diff.txt: reorder possible usages git-diff.txt: don't mark required argument as optional
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions