threads / patch / 13188

patchbash: Add completion for git diff --base --ours --theirs

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

## tl;dr

2 messages between Apr 20, 2008 and Apr 22, 2008. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Teemu Likonen· Apr 20, 2008, 19:32 UTC · lore

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

Show changes to contrib/completion/git-completion.bash +1 −0

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

Shawn O. Pearce· Apr 22, 2008, 00:04 UTC · re: Teemu Likonen · lore

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

Teemu Likonen <tlikonen@iki.fi> wrote:

Show 12 quoted lines

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