Skip to content

Commit

Permalink
bash: Add completion for git diff --base --ours --theirs
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Teemu Likonen authored and Junio C Hamano committed Apr 22, 2008
1 parent 37152d8 commit f457413
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions contrib/completion/git-completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
;;
Expand Down

0 comments on commit f457413

Please sign in to comment.