From: Shawn O. Pearce Date: Tue, 22 Apr 2008 00:04:26 GMT Subject: Re: [PATCH] bash: Add completion for git diff --base --ours --theirs Message-ID: <20080422000426.GR29771@spearce.org> In-Reply-To: <20080420193247.GA21023@mithlond.arda.local> Teemu Likonen 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 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.