diff options
| author | Teemu Likonen <tlikonen@iki.fi> | 2008-04-20 19:32:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-22 05:52:15 (GMT) |
| commit | f45741390844778f5b286cf6607cd767636e5c57 (patch) | |
| tree | fa28372fcb4ecf4565845fa80dfea951a749cdba /contrib | |
| parent | 37152d831048a0b30600a7b7e7926af2d5bcfab8 (diff) | |
| download | git-f45741390844778f5b286cf6607cd767636e5c57.zip git-f45741390844778f5b286cf6607cd767636e5c57.tar.gz git-f45741390844778f5b286cf6607cd767636e5c57.tar.bz2 | |
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-x | contrib/completion/git-completion.bash | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4d81963..6949cac 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 ;; |