Junio C Hamano 05f6e1be8c Merge branch 'cp/merge-continue' ... "git merge --continue" has been added as a synonym to "git commit" to conclude a merge that has stopped due to conflicts. * cp/merge-continue: merge: mark usage error strings for translation merge: ensure '--abort' option takes no arguments completion: add --continue option for merge merge: add '--continue' option as a synonym for 'git commit'		2016-12-27 00:11:41 -08:00
..
git-completion.bash	Merge branch 'cp/merge-continue'	2016-12-27 00:11:41 -08:00
git-completion.tcsh	git-completion.tcsh: fix redirect with noclobber	2015-06-09 11:21:15 -07:00
git-completion.zsh
git-prompt.sh	Merge branch 'vs/prompt-avoid-unset-variable' into maint	2016-07-06 13:06:38 -07:00