From: Teemu Likonen <tlikonen@iki.fi>
Date: Sun, 20 Apr 2008 19:32:47 +0000 (+0300)
Subject: bash: Add completion for git diff --base --ours --theirs
X-Git-Tag: v1.5.5.2~30
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f45741390844778f5b286cf6607cd767636e5c57?ds=inline;hp=--cc

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>
---

f45741390844778f5b286cf6607cd767636e5c57
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4d81963b1d..6949cac45d 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
 		;;