From: Shawn O. Pearce Date: Mon, 5 Feb 2007 04:52:02 +0000 (-0500) Subject: bash: Support git-rebase -m continuation completion. X-Git-Tag: v1.5.0-rc4~22 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c5650b0840ef1630ab9e67e9e314fb73ca112cdc;p=git.git 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 Signed-off-by: Junio C Hamano --- diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 430e6367a..b0ff87d8d 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -675,7 +675,7 @@ _git_push () _git_rebase () { local cur="${COMP_WORDS[COMP_CWORD]}" - if [ -d .dotest ]; then + if [ -d .dotest ] || [ -d .git/.dotest-merge ]; then __gitcomp "--continue --skip --abort" return fi