diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-02-04 23:52:02 -0500 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-02-05 19:09:40 -0800 |
| commit | c5650b0840ef1630ab9e67e9e314fb73ca112cdc (patch) | |
| tree | c50bc592160431241616d96eab09379e0f76bf96 | |
| parent | Fix longstanding mismerge of ALL_CFLAGS vs BASIC_CFLAGS (diff) | |
| download | tgif-c5650b0840ef1630ab9e67e9e314fb73ca112cdc.tar.xz | |
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>
| -rwxr-xr-x | contrib/completion/git-completion.bash | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 430e6367a7..b0ff87d8d0 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 |