aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTeemu Likonen <tlikonen@iki.fi>2008-04-20 22:32:47 +0300
committerJunio C Hamano <gitster@pobox.com>2008-04-21 22:52:15 -0700
commitf45741390844778f5b286cf6607cd767636e5c57 (patch)
treefa28372fcb4ecf4565845fa80dfea951a749cdba /contrib
parent37152d831048a0b30600a7b7e7926af2d5bcfab8 (diff)
downloadgit-f45741390844778f5b286cf6607cd767636e5c57.tar.gz
git-f45741390844778f5b286cf6607cd767636e5c57.tar.xz
bash: Add completion for git diff --base --ours --theirs
Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4d81963b1..6949cac45 100755
--- 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
;;