org/kernel/git.git - forked from git/git

	Commit message (Expand)	Author	Age
*	Merge branch 'bm/merge-base-octopus-dedup'	Junio C Hamano	2014-01-10
\|\
\| *	merge-base --octopus: reduce the result from get_octopus_merge_bases()	Junio C Hamano	2013-12-30
\| *	merge-base: separate "--independent" codepath into its own helper	Junio C Hamano	2013-12-30
* \|	merge-base: teach "--fork-point" mode	Junio C Hamano	2013-10-29
* \|	merge-base: use OPT_CMDMODE and clarify the command line parsing	Junio C Hamano	2013-10-23
* \|	Replace deprecated OPT_BOOLEAN by OPT_BOOL	Stefan Beller	2013-08-05
\|/
*	use logical OR (\|\|) instead of binary OR (\|) in logical context	René Scharfe	2013-06-13
*	Merge branch 'jc/merge-bases'	Junio C Hamano	2012-09-11
\|\
\| *	merge-base: "--is-ancestor A B"	Junio C Hamano	2012-08-31
* \|	i18n: merge-base: mark parseopt strings for translation	Nguyễn Thái Ngọc Duy	2012-08-20
\|/
*	Documentation: update to git-merge-base --octopus	Vincent van Ravesteijn	2011-04-15
*	merge-base --independent to print reduced parent list in a merge	Jonathan Nieder	2010-08-18
*	merge-base --octopus to mimic show-branch --merge-base	Jonathan Nieder	2010-08-18
*	Move 'builtin-*' into a 'builtin/' subdirectory	Linus Torvalds	2010-02-22