From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 Nov 2020 21:17:39 +0000 (-0800)
Subject: Merge branch 'dl/diff-merge-base'
X-Git-Tag: v2.30.0-rc0~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b6fb70c985a6fc113e971a6696f328abf8315dce;p=thirdparty%2Fgit.git

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
---

b6fb70c985a6fc113e971a6696f328abf8315dce
diff --cc contrib/completion/git-completion.bash
index aea30d74a0,679d1ec8a8..36f5a91c7a
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -1695,9 -1689,12 +1695,13 @@@ __git_diff_common_options="--stat --num
  			--submodule --submodule= --ignore-submodules
  			--indent-heuristic --no-indent-heuristic
  			--textconv --no-textconv
 +			--patch --no-patch
  "
  
+ __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
+ 			--base --ours --theirs --no-index --relative --merge-base
+ 			$__git_diff_common_options"
+ 
  _git_diff ()
  {
  	__git_has_doubledash && return