From: Denton Liu Date: Sun, 20 Sep 2020 11:22:27 +0000 (-0700) Subject: contrib/completion: complete `git diff --merge-base` X-Git-Tag: v2.30.0-rc0~135^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cce7d6ecfc45f0d74a95c6ca6447d6e327791348;p=thirdparty%2Fgit.git contrib/completion: complete `git diff --merge-base` Signed-off-by: Denton Liu Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f68c8e0646..679d1ec8a8 100644 --- 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 ()