bash: Support git-rebase -m continuation completion.
Apparently `git-rebase -m` uses a metadata directory within .git (.git/.dotest-merge) rather than .dotest used by git-am (and git-rebase without the -m option). This caused the completion code to not offer --continue, --skip or --abort when working within a `git-rebase -m` session. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Shawn O. Pearce committed
Feb 4, 2007 at 23:52 UTC
c5650b0840ef1630ab9e67e9e314fb73ca112cdc
1 file changed
+1
-1
contrib/completion/git-completion.bash
+1
-1
@@ -675,7 +675,7 @@ _git_push ()
675
_git_rebase ()
676
{
677
local cur="${COMP_WORDS[COMP_CWORD]}"
678
- if [ -d .dotest ]; then
678
+ if [ -d .dotest ] || [ -d .git/.dotest-merge ]; then
679
__gitcomp "--continue --skip --abort"
680
return
681
fi