author | Shawn O. Pearce <spearce@spearce.org> | |
Mon, 5 Feb 2007 04:52:02 +0000 (23:52 -0500) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Tue, 6 Feb 2007 03:09:40 +0000 (19:09 -0800) | ||
commit | c5650b0840ef1630ab9e67e9e314fb73ca112cdc | |
tree | c50bc592160431241616d96eab09379e0f76bf96 | tree | snapshot |
parent | 8188e73b17c570517ac3bac742810f1b2e5c420d | commit | diff |
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>
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>
contrib/completion/git-completion.bash | diff | blob | history |