John Keeping 8fee872647 completion: add missing options for git-merge ... The options added to __git_merge_options are those that git-pull passes to git-merge, since that variable is used by both commands. Those added directly in _git_merge() are specific to git-merge and are not passed thru from git-pull. Reported-by: Haralan Dobrev <hkdobrev@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2014-05-27 12:27:50 -07:00
..
git-completion.bash	completion: add missing options for git-merge	2014-05-27 12:27:50 -07:00
git-completion.tcsh	remove #!interpreter line from shell libraries	2013-11-26 14:23:56 -08:00
git-completion.zsh	completion: fix completing args of aliased "push", "fetch", etc.	2014-04-09 14:22:18 -07:00
git-prompt.sh	Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname'	2014-05-19 16:10:10 -07:00