From: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Date: Wed, 5 Aug 2015 13:40:00 +0000 (+0200)
Subject: completion: offer '--edit-todo' during interactive rebase
X-Git-Tag: v2.6.0-rc0~56^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09bb6520d416a0d0d91ca646dae2d23d91c95ba8;p=thirdparty%2Fgit.git

completion: offer '--edit-todo' during interactive rebase

Helped-by: John Keeping <john@keeping.me.uk>
Helped-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Thomas Braun <thomas.braun@virtuell-zuhause.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index c97c648d7e..087771bb89 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