From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
To: git <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"John Keeping" <john@keeping.me.uk>,
"SZEDER Gábor" <szeder@ira.uka.de>,
"Ramkumar Ramachandra" <artagnon@gmail.com>
Subject: [PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase
Date: Wed, 5 Aug 2015 15:40:00 +0200 (CEST) [thread overview]
Message-ID: <1331856388.22157.1438782000895.JavaMail.open-xchange@app06.ox.hosteurope.de> (raw)
In-Reply-To: <20150801112507.Horde.r5NtLucc5RqP3Wy8gdC7CQ1@webmail.informatik.kit.edu>
Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Helped-by: John Keeping <john@keeping.me.uk>
Helped-by: SZEDER Gábor <szeder@ira.uka.de>
---
Tested by:
- ensuring I'm in a bash shell
- source git-completion.bash
- git rebase -i HEAD~1, choose edit instead of pick in the editor
- on entering "git rebase" you should be offered "--edit-todo"
contrib/completion/git-completion.bash | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index c97c648..087771b 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1667,7 +1667,10 @@ _git_push ()
_git_rebase ()
{
local dir="$(__gitdir)"
- if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
+ if [ -f "$dir"/rebase-merge/interactive ]; then
+ __gitcomp "--continue --skip --abort --edit-todo"
+ return
+ elif [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then
__gitcomp "--continue --skip --abort"
return
fi
--
2.4.3.413.ga5fe668
prev parent reply other threads:[~2015-08-05 13:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 11:27 [PATCH] completion: Add '--edit-todo' to rebase Thomas Braun
2015-07-13 13:11 ` John Keeping
2015-07-27 17:54 ` [PATCH v2] " Thomas Braun
2015-07-30 11:24 ` SZEDER Gábor
2015-07-30 11:29 ` John Keeping
2015-07-31 10:16 ` SZEDER Gábor
2015-07-31 17:37 ` Thomas Braun
2015-08-01 9:25 ` SZEDER Gábor
2015-08-05 13:40 ` Thomas Braun [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
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=1331856388.22157.1438782000895.JavaMail.open-xchange@app06.ox.hosteurope.de \
--to=thomas.braun@virtuell-zuhause.de \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--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.
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).