rhi/git -

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'ma/up-to-date'	Junio C Hamano	2017-09-10	1	-1/+1
\|\
\| *	treewide: correct several "up-to-date" to "up to date"	Martin Ågren	2017-08-23	1	-1/+1
* \|	scripts: use "git foo" not "git-foo"	Michael Forney	2017-08-07	1	-1/+1
\|/
*	git-merge-octopus: do not capitalize "octopus"	Alex Henrie	2016-09-08	1	-2/+2
*	i18n: git-sh-setup.sh: mark strings for translation	Vasco Almeida	2016-06-17	1	-1/+0
*	merge-octopus: use die shell function from git-sh-setup.sh	Vasco Almeida	2016-06-17	1	-5/+1
*	i18n: merge-octopus: mark messages for translation	Vasco Almeida	2016-06-17	1	-8/+10
*	merge-octopus: abort if index does not match HEAD	Elijah Newren	2016-04-12	1	-0/+6
*	merge-octopus: Work around environment issue on Windows	Johannes Schindelin	2010-10-01	1	-0/+5
*	octopus: remove dead code	Stephen Boyd	2009-12-13	1	-5/+1
*	octopus: reenable fast-forward merges	Stephen Boyd	2009-12-13	1	-1/+1
*	octopus: make merge process simpler to follow	Stephen Boyd	2009-12-13	1	-4/+5
*	git-merge-octopus: use (merge-base A (merge B C D E...)) for stepwise merge	Junio C Hamano	2008-07-30	1	-9/+2
*	Rewrite "git-frotz" to "git frotz"	Junio C Hamano	2007-07-02	1	-7/+7
*	read-tree --aggressive	Junio C Hamano	2006-02-06	1	-1/+1
*	octopus: allow manual resolve on the last round.	Junio C Hamano	2006-01-14	1	-6/+14
*	octopus: allow criss-cross and clarify the message when it rejects	Junio C Hamano	2006-01-13	1	-7/+7
*	define die() for scripts that use it.	Junio C Hamano	2005-11-28	1	-0/+5
*	octopus: do not do AND'ed merge base.	Junio C Hamano	2005-11-11	1	-5/+20
*	Multi-backend merge driver.	Junio C Hamano	2005-09-10	1	-0/+86