summaryrefslogtreecommitdiff
path: root/contrib/completion/.gitattributes
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-02 21:17:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-02 21:17:39 (GMT)
commitb6fb70c985a6fc113e971a6696f328abf8315dce (patch)
tree4b9e3bfc3f87b29bcf0d64382fae38762d1202ab /contrib/completion/.gitattributes
parent761a4e9ab1950fc7b868629ebe478bb41235db45 (diff)
parentcce7d6ecfc45f0d74a95c6ca6447d6e327791348 (diff)
downloadgit-b6fb70c985a6fc113e971a6696f328abf8315dce.zip
git-b6fb70c985a6fc113e971a6696f328abf8315dce.tar.gz
git-b6fb70c985a6fc113e971a6696f328abf8315dce.tar.bz2
Merge branch 'dl/diff-merge-base'
"git diff A...B" learned "git diff --merge-base A B", which is a longer short-hand to say the same thing. * dl/diff-merge-base: contrib/completion: complete `git diff --merge-base` builtin/diff-tree: learn --merge-base builtin/diff-index: learn --merge-base t4068: add --merge-base tests diff-lib: define diff_get_merge_base() diff-lib: accept option flags in run_diff_index() contrib/completion: extract common diff/difftool options git-diff.txt: backtick quote command text git-diff-index.txt: make --cached description a proper sentence t4068: remove unnecessary >tmp
Diffstat (limited to 'contrib/completion/.gitattributes')
0 files changed, 0 insertions, 0 deletions