summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2006-11-27 03:40:47 -0500
committerJunio C Hamano <junkio@cox.net>2006-11-27 12:08:58 -0800
commit4ad91321ee95598c2488ab5e39afec13575d4e3f (patch)
treef3b68f2465ffd409307e7e2aa5d815ab80023b1a /git-commit-script
parentfde97d8ac63efa466dd48436d2178bd364b846de (diff)
Teach git-completion.bash how to complete git-merge.
Now that git-merge is high-level Porcelain users are going to expect to be able to use it from the command line, in which case we really should also be able to complete ref names as parameters. I'm also including completion support for the merge strategies that are supported by git-merge.sh, should the user wish to use a different strategy than their default. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-commit-script')
0 files changed, 0 insertions, 0 deletions