contrib/completion: complete git diff --merge-base

Denton-L · gitster · commit cce7d6ecfc45 · 2020-09-21T14:09:46.000-07:00
Signed-off-by: Denton Liu &lt;liu.denton@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1692,7 +1692,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 "
 
 __git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs --no-index --relative
+			--base --ours --theirs --no-index --relative --merge-base
 			$__git_diff_common_options"
 
 _git_diff ()

Original file line number	Diff line number	Diff line change
`@@ -1692,7 +1692,7 @@ __git_diff_common_options="--stat --numstat --shortstat --summary`
`1692`	`1692`	`"`
`1693`	`1693`
`1694`	`1694`	`__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex`
`1695`		`- --base --ours --theirs --no-index --relative`
	`1695`	`+ --base --ours --theirs --no-index --relative --merge-base`
`1696`	`1696`	`$__git_diff_common_options"`
`1697`	`1697`
`1698`	`1698`	`_git_diff ()`