diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2006-11-27 15:10:42 -0500 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-11-27 12:57:15 -0800 |
commit | ce1e39d29ee373786ceda9e79d0906a6451ab5a5 (patch) | |
tree | bfe2228fe7f39cceaa63498bc4e26eba825ae780 /git-merge-resolve.sh | |
parent | 5de40f59d4954738448e238b06eed72f73cca740 (diff) | |
download | git-ce1e39d29ee373786ceda9e79d0906a6451ab5a5.tar.gz |
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>
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions