From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Thomas Braun <thomas.braun@virtuell-zuhause.de>
Subject: [PATCH v1 1/1] completion: add remaining flags to checkout
Date: Thu, 12 Oct 2017 14:20:59 +0200 [thread overview]
Message-ID: <20171012122059.17242-1-thomas.braun@virtuell-zuhause.de> (raw)
In the commits 1d0fa898 (checkout: add --ignore-other-wortrees,
2015-01-03), 1fc458d9 (builtin/checkout: add --recurse-submodules switch,
2017-03-14), 870ebdb9 (checkout: add --progress option, 2015-11-01),
08d595dc (checkout: add --ignore-skip-worktree-bits in sparse checkout
mode, 2013-04-13), 1d0fa898 (checkout: add --ignore-other-wortrees,
2015-01-03), 32669671 (checkout: introduce --detach synonym for "git
checkout foo^{commit}", 2011-02-08) and db941099 (checkout -f: allow
ignoring unmerged paths when checking out of the index, 2008-08-30)
checkout gained new flags but the completion was not updated, although
these flags are useful completions. Add them.
Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
---
contrib/completion/git-completion.bash | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index d934417475..393d4ae230 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1250,7 +1250,9 @@ _git_checkout ()
--*)
__gitcomp "
--quiet --ours --theirs --track --no-track --merge
- --conflict= --orphan --patch
+ --conflict= --orphan --patch --detach --progress --no-progress
+ --force --ignore-skip-worktree-bits --ignore-other-worktrees
+ --recurse-submodules --no-recurse-submodules
"
;;
*)
--
2.15.0.rc0.245.g6d586db062
next reply other threads:[~2017-10-12 12:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-12 12:20 Thomas Braun [this message]
2017-10-12 16:50 ` [PATCH v1 1/1] completion: add remaining flags to checkout Johannes Sixt
2017-10-12 20:30 ` Johannes Sixt
2017-10-24 13:18 ` Thomas Braun
2017-10-24 13:19 ` [PATCH v2 " Thomas Braun
2017-10-24 16:45 ` Johannes Sixt
2017-10-25 6:03 ` Junio C Hamano
2017-10-25 6:22 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171012122059.17242-1-thomas.braun@virtuell-zuhause.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).