summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-02-05 04:52:02 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-06 03:09:40 (GMT)
commitc5650b0840ef1630ab9e67e9e314fb73ca112cdc (patch)
treec50bc592160431241616d96eab09379e0f76bf96 /contrib
parent8188e73b17c570517ac3bac742810f1b2e5c420d (diff)
downloadgit-c5650b0840ef1630ab9e67e9e314fb73ca112cdc.zip
git-c5650b0840ef1630ab9e67e9e314fb73ca112cdc.tar.gz
git-c5650b0840ef1630ab9e67e9e314fb73ca112cdc.tar.bz2
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>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 430e636..b0ff87d 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