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

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index f68c8e06464624d0bc9d8a5b97cade346e3e3098..679d1ec8a80c0fc2c587532bdbf0e1fcf9b567e5 100644 (file)
--- 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 ()