Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
[gitweb.git]
/
contrib
/
completion
/
git-completion.bash
diff --git
a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 6012047ee55cb846f1ab05a9bca13aafe3267f64..665a895f5eafff619d30034afba27ac9f597eb4e 100755
(executable)
--- a/
contrib/completion/git-completion.bash
+++ b/
contrib/completion/git-completion.bash
@@
-641,6
+641,7
@@
_git_diff ()
--ignore-all-space --exit-code --quiet --ext-diff
--no-ext-diff
--no-prefix --src-prefix= --dst-prefix=
+ --base --ours --theirs
"
return
;;