mirror of
https://github.com/git/git.git
synced 2026-05-31 11:19:02 +02:00
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>
This commit is contained in:
committed by
Junio C Hamano
parent
3d09c22869
commit
cce7d6ecfc
@@ -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 ()
|
||||
|
||||
Reference in New Issue
Block a user