git.99rst.org Git - git.git/commit

author	Shawn O. Pearce <redacted>
	Mon, 27 Nov 2006 08:40:47 +0000 (03:40 -0500)
committer	Junio C Hamano <redacted>
	Mon, 27 Nov 2006 20:08:58 +0000 (12:08 -0800)
commit	4ad91321ee95598c2488ab5e39afec13575d4e3f
tree	f3b68f2465ffd409307e7e2aa5d815ab80023b1a	tree \| snapshot
parent	fde97d8ac63efa466dd48436d2178bd364b846de	commit \| 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 <redacted>
Signed-off-by: Junio C Hamano <redacted>