From: "Shawn O. Pearce" <spearce@spearce.org>
To: Teemu Likonen <tlikonen@iki.fi>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] bash: Add completion for git diff --base --ours --theirs
Date: Mon, 21 Apr 2008 20:04:26 -0400 [thread overview]
Message-ID: <20080422000426.GR29771@spearce.org> (raw)
In-Reply-To: <20080420193247.GA21023@mithlond.arda.local>
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.
prev parent reply other threads:[~2008-04-22 0:05 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-20 19:32 [PATCH] bash: Add completion for git diff --base --ours --theirs Teemu Likonen
2008-04-22 0:04 ` Shawn O. Pearce [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080422000426.GR29771@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tlikonen@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).