delta/git.git - github.com: git/git.git

	Commit message (Expand)	Author	Age	Files	Lines
*	contrib/examples/git-merge.sh: avoid "test <cond> -a/-o <cond>"	Elia Pinto	2014-06-09	1	-2/+2
*	git-merge.sh: use the $( ... ) construct for command substitution	Elia Pinto	2014-04-17	1	-2/+2
*	use 'commit-ish' instead of 'committish'	Richard Hansen	2013-09-04	1	-1/+1
*	merge script: learn --[no-]rerere-autoupdate	Jonathan Nieder	2010-08-18	1	-2/+5
*	merge script: notice @{-1} shorthand	Jonathan Nieder	2010-08-18	1	-2/+4
*	merge script: handle --no-ff --no-commit correctly	Jonathan Nieder	2010-08-18	1	-2/+10
*	merge script: --ff-only to disallow true merge	Jonathan Nieder	2010-08-18	1	-2/+15
*	merge script: handle many-way octopus	Jonathan Nieder	2010-08-18	1	-3/+3
*	merge script: handle -m --log correctly	Jonathan Nieder	2010-08-18	1	-4/+10
*	merge script: forbid merge -s index	Jonathan Nieder	2010-08-18	1	-0/+5
*	merge script: allow custom strategies	Jonathan Nieder	2010-08-18	1	-2/+6
*	merge script: merge -X<option>	Jonathan Nieder	2010-08-18	1	-1/+7
*	merge script: improve log message subject	Jonathan Nieder	2010-08-18	1	-8/+19
*	merge script: refuse to merge during merge	Jonathan Nieder	2010-08-18	1	-0/+3
*	merge script: tweak unmerged files message to match builtin	Jonathan Nieder	2010-08-18	1	-1/+1
*	merge script: --squash, --ff from unborn branch are errors	Jonathan Nieder	2010-08-18	1	-0/+4
*	git merge -X<option>	Avery Pennarun	2010-01-17	1	-1/+2
*	Use 'fast-forward' all over the place	Felipe Contreras	2009-10-24	1	-4/+4
*	Merge branch 'sb/dashless'	Junio C Hamano	2008-07-16	1	-2/+2
*	Build in merge	Miklos Vajna	2008-07-07	1	-0/+554