diff options
| author | Denton Liu <liu.denton@gmail.com> | 2020-09-20 11:22:27 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-21 21:09:46 (GMT) |
| commit | cce7d6ecfc45f0d74a95c6ca6447d6e327791348 (patch) | |
| tree | dacdbd9e322770b837b024fa64c44178d3945a4e /contrib | |
| parent | 3d09c22869a7bd47f1683031937af0ed93b2fa3b (diff) | |
| download | git-cce7d6ecfc45f0d74a95c6ca6447d6e327791348.zip git-cce7d6ecfc45f0d74a95c6ca6447d6e327791348.tar.gz git-cce7d6ecfc45f0d74a95c6ca6447d6e327791348.tar.bz2 | |
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>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index f68c8e0..679d1ec 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 () |