git.99rst.org
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
| inline |
side by side
(parent:
3d09c22
)
contrib/completion: complete `git diff --merge-base`
author
Denton Liu
<redacted>
Sun, 20 Sep 2020 11:22:27 +0000
(
04:22
-0700)
committer
Junio C Hamano
<redacted>
Mon, 21 Sep 2020 21:09:46 +0000
(14:09 -0700)
Signed-off-by: Denton Liu <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/completion/git-completion.bash
patch
|
blob
|
history
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 ()
git clone https://git.99rst.org/PROJECT