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

	Commit message (Expand)	Author	Age
*	Merge branch 'jv/merge-nothing-into-void' into maint	Junio C Hamano	2016-04-14
\|\
\| *	merge: fix NULL pointer dereference when merging nothing into void	Junio C Hamano	2016-03-23
* \|	Merge branch 'ss/commit-squash-msg' into maint	Junio C Hamano	2016-04-14
\|\ \ \| \|/ \|/\|
\| *	commit: do not lose SQUASH_MSG contents	Sven Strickroth	2016-03-21
* \|	Merge branch 'jk/merge-file-exit-code'	Junio C Hamano	2015-10-30
\|\ \ \| \|/ \|/\|
\| *	merge-file: clamp exit code to maximum 127	Jeff King	2015-10-29
* \|	t: fix trivial &&-chain breakage	Jeff King	2015-03-20
\|/
*	git-show: fix 'git show -s' to not add extra terminator after merge commit	Max Kirillov	2014-05-15
*	t7600: fix typo in test title	Junio C Hamano	2013-07-23
*	merge: handle --ff/--no-ff/--ff-only as a tri-state option	Miklos Vajna	2013-07-02
*	Merge branch 'vl/typofix'	Junio C Hamano	2013-06-26
\|\
\| *	random typofixes (committed missing a 't', successful missing an 's')	Veres Lajos	2013-06-19
* \|	t7600: use test_config to set/unset git config variables	Yann Droneaud	2013-03-25
\|/
*	Fix tests under GETTEXT_POISON on parseopt	Jiang Xin	2012-08-27
*	merge: do not launch an editor on "--no-edit $tag"	Junio C Hamano	2012-02-09
*	merge: do not create a signed tag merge under --ff-only option	Junio C Hamano	2012-02-05
*	merge: record tag objects without peeling in MERGE_HEAD	Junio C Hamano	2011-11-08
*	merge: notice local merging of tags and keep it unwrapped	Junio C Hamano	2011-11-07
*	Teach merge the '[-e\|--edit]' option	Jay Soffian	2011-10-12
*	Merge branch 'mg/merge-ff-config'	Junio C Hamano	2011-05-16
\|\
\| *	tests: check git does not barf on merge.ff values for future versions of git	Jonathan Nieder	2011-05-06
\| *	merge: introduce merge.ff configuration variable	Junio C Hamano	2011-05-06
\| *	Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config	Junio C Hamano	2011-05-06
\| \|\
* \| \	Merge branch 'jc/maint-branch-mergeoptions'	Junio C Hamano	2011-05-11
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	merge: make branch.<name>.mergeoptions correctly override merge.<option>	Junio C Hamano	2011-05-06
* \| \|	Merge branch 'jn/maint-test-merge-verify-parents'	Junio C Hamano	2011-05-11
\|\ \ \
\| * \| \|	tests: teach verify_parents to check for extra parents	Jonathan Nieder	2011-05-06
\| * \| \|	tests: eliminate unnecessary setup test assertions	Jonathan Nieder	2011-05-06
\| \| \|/ \| \|/\|
* \| \|	i18n: use test_i18n{cmp,grep} in t7600, t7607, t7611 and t7811	Junio C Hamano	2011-04-14
\|/ /
* \|	i18n: git-merge "Wonderful" message	Ævar Arnfjörð Bjarmason	2011-03-09
* \|	merge -h: show usage even with corrupt index	Nguyễn Thái Ngọc Duy	2010-10-22
* \|	t7600 (merge): test merge from branch yet to be born	Jonathan Nieder	2010-08-18
* \|	t7600 (merge): check reflog entry	Jonathan Nieder	2010-08-18
* \|	t7600 (merge): do not launch gitk for --debug	Jonathan Nieder	2010-08-18
* \|	t7600 (merge): modernize style	Jonathan Nieder	2010-08-18
* \|	merge: do not mistake (ancestor of) tag for branch	Jonathan Nieder	2010-08-18
* \|	war on "sleep" in tests	Junio C Hamano	2010-04-06
\|/
*	Teach 'git merge' and 'git pull' the option --ff-only	Björn Gustavsson	2009-10-30
*	Merge branch 'mv/merge-noff'	Junio C Hamano	2008-10-19
\|\
\| *	builtin-commit: use reduce_heads() only when appropriate	Miklos Vajna	2008-10-03
* \|	Merge branch 'maint'	Junio C Hamano	2008-10-17
\|\ \
\| * \|	Add testcase to ensure merging an early part of a branch is done properly	Miklos Vajna	2008-10-14
* \| \|	builtin-merge: refresh the index before calling a strategy	Miklos Vajna	2008-10-03
\| \|/ \|/\|
* \|	Merge branch 'maint'	Junio C Hamano	2008-09-03
\|\ \ \| \|/
\| *	tests: use "git xyzzy" form (t7200 - t9001)	Nanako Shiraishi	2008-09-03
* \|	Merge branch 'mv/merge-custom'	Junio C Hamano	2008-08-27
\|\ \ \| \|/ \|/\|
\| *	Add a second testcase for handling invalid strategies in git-merge	Miklos Vajna	2008-07-29
* \|	merge: fix numerus bugs around "trivial merge" area	Junio C Hamano	2008-08-23
* \|	"git-merge": allow fast-forwarding in a stat-dirty tree	Junio C Hamano	2008-08-20
\|/
*	builtin-merge.c: Fix option parsing	Michele Ballabio	2008-07-20