From: Thomas Braun Date: Wed, 05 Aug 2015 13:40:00 GMT Subject: [PATCH v3 1/1] completion: offer '--edit-todo' during interactive rebase Message-ID: <1331856388.22157.1438782000895.JavaMail.open-xchange@app06.ox.hosteurope.de> In-Reply-To: <20150801112507.Horde.r5NtLucc5RqP3Wy8gdC7CQ1@webmail.informatik.kit.edu> Signed-off-by: Thomas Braun Helped-by: John Keeping Helped-by: SZEDER Gábor --- 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