From: "Shawn O. Pearce" <spearce@spearce.org>
To: SZEDER G??bor <szeder@ira.uka.de>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH 4/4] bash: teach 'git checkout' options
Date: Tue, 22 Sep 2009 08:28:46 -0700 [thread overview]
Message-ID: <20090922152846.GQ14660@spearce.org> (raw)
In-Reply-To: <7c8c4f6a4c581bcba101b8ca467d241738aa376e.1253009868.git.szeder@ira.uka.de>
SZEDER G??bor <szeder@ira.uka.de> wrote:
> @@ -809,7 +809,18 @@ _git_checkout ()
> {
> __git_has_doubledash && return
>
> - __gitcomp "$(__git_refs)"
> + local cur="${COMP_WORDS[COMP_CWORD]}"
> + case "$cur" in
> + --*)
> + __gitcomp "
> + --quiet --ours --theirs --track --no-track --merge
> + --conflict= --patch
If we are completing long options, shouldn't we also complete the
supported values for --conflict? According to the docs, this is
'merge' and 'diff3'.
--
Shawn.
next prev parent reply other threads:[~2009-09-22 15:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-15 10:21 [PATCH 1/4] bash: rename __git_find_subcommand() to __git_find_on_cmdline() SZEDER Gábor
2009-09-15 10:21 ` [PATCH 2/4] bash: update 'git stash' completion SZEDER Gábor
2009-09-15 10:21 ` [PATCH 3/4] bash: teach 'git reset --patch' SZEDER Gábor
2009-09-15 10:21 ` [PATCH 4/4] bash: teach 'git checkout' options SZEDER Gábor
2009-09-22 15:28 ` Shawn O. Pearce [this message]
2009-09-24 12:23 ` [PATCHv2] " SZEDER Gábor
2009-09-22 15:29 ` [PATCH 3/4] bash: teach 'git reset --patch' Shawn O. Pearce
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=20090922152846.GQ14660@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=szeder@ira.uka.de \
/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).