[PATCH] bash: Add completion for git diff --base --ours --theirs

[PATCH] bash: Add completion for git diff --base --ours --theirs

[Teemu Likonen]

Signed-off-by: Teemu Likonen <tlikonen@iki.fi>
---

I guess these options should be documented in git-diff.txt too but I'm
hesitant to do it because my understanding of merge stages isn't quite
enough.


 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
 		;;
-- 
1.5.5.84.g295c

Re: [PATCH] bash: Add completion for git diff --base --ours --theirs

[Shawn O. Pearce]

Teemu Likonen <tlikonen@iki.fi> wrote:
> 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
>  		;;

Hmmph.  I must not be paying enough attention to the mailing list.
I didn't know these were supported on git-diff.  Oh, wow, Linus
added these, and he never documents things.  No wonder they are
undocumented.  :)

Anyway.  Acked-by: Shawn O. Pearce <spearce@spearce.org>

But documentation would be nice too.  However I can see why you
wouldn't want to contribute that; its easy enough to insert these
flags into the completion, but its another matter to explain what
they are actually doing for you.

-- 
Shawn.