| commit | ce1e39d29ee373786ceda9e79d0906a6451ab5a5 | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Mon, 27 Nov 2006 20:10:42 +0000 (27 15:10 -0500) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 27 Nov 2006 20:57:15 +0000 (27 12:57 -0800) | ||
| tree | bfe2228fe7f39cceaa63498bc4e26eba825ae780 | treesnapshot (tar.gz zip) |
| parent | 5de40f59d4954738448e238b06eed72f73cca740 | commitdiff |
Support --strategy=x completion in addition to --strategy x.
Because git-merge and git-rebase both accept -s, --strategy or --strategy=
we should recognize all three formats in the bash completion functions and
issue back all merge strategies on demand.
I also moved the prior word testing to be before the current word testing,
as the current word cannot be completed with -- if the prior word was an
option which requires a parameter, such as -s or --strategy.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Because git-merge and git-rebase both accept -s, --strategy or --strategy=
we should recognize all three formats in the bash completion functions and
issue back all merge strategies on demand.
I also moved the prior word testing to be before the current word testing,
as the current word cannot be completed with -- if the prior word was an
option which requires a parameter, such as -s or --strategy.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| contrib/completion/git-completion.bash | diffblobblamehistory |