John Keeping 6d2b06f02b completion: add a note that merge options are shared ... This should avoid future confusion after a subsequent patch has added some options to __git_merge_options and some directly in _git_merge(). Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2014-05-27 12:27:36 -07:00
..
git-completion.bash	completion: add a note that merge options are shared	2014-05-27 12:27:36 -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