summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorThomas Braun <thomas.braun@virtuell-zuhause.de>2015-08-05 15:40:00 +0200
committerJunio C Hamano <gitster@pobox.com>2015-08-05 13:35:36 -0700
commit09bb6520d416a0d0d91ca646dae2d23d91c95ba8 (patch)
treeca77ad2d6423943b3d5ab4ff2fcf5f996207db34 /contrib
parenta17c56c056d5fea0843b429132904c429a900229 (diff)
downloadgit-09bb6520d416a0d0d91ca646dae2d23d91c95ba8.tar.gz
completion: offer '--edit-todo' during interactive rebasetb/complete-rebase-i-edit-todo
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>
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash5
1 files changed, 4 insertions, 1 deletions
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