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

	Commit message (Expand)	Author	Age
*	Merge branch 'ak/t4151-ls-files-could-be-empty'	Junio C Hamano	2016-05-17
\|\
\| *	t4151: make sure argument to 'test -z' is given	Armin Kunaschik	2016-05-09
\| *	Merge branch 'pt/am-abort-fix' into maint	Junio C Hamano	2015-08-03
\| \|\
* \| \|	am --skip/--abort: merge HEAD/ORIG_HEAD tree into index	Paul Tan	2015-08-19
* \| \|	t4151: am --abort will keep dirty index intact	Paul Tan	2015-07-20
* \| \|	Merge branch 'pt/am-abort-fix'	Junio C Hamano	2015-06-24
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	am --abort: keep unrelated commits on unborn branch	Paul Tan	2015-06-08
\| *	am --abort: support aborting to unborn branch	Paul Tan	2015-06-08
\| *	am --abort: revert changes introduced by failed 3way merge	Paul Tan	2015-06-08
\| *	am --skip: support skipping while on unborn branch	Paul Tan	2015-06-08
\| *	am -3: support 3way merge on unborn branch	Paul Tan	2015-06-08
\| *	am --skip: revert changes introduced by failed 3way merge	Paul Tan	2015-06-08
* \|	t: fix some trivial cases of ignored exit codes in loops	Jeff King	2015-03-25
\|/
*	i18n: git-am core say messages	Ævar Arnfjörð Bjarmason	2011-05-21
*	am --abort: keep unrelated commits since the last failure and warn	Junio C Hamano	2010-12-21
*	MERGE_RR is in .git, not .git/rr-cache	Jay Soffian	2010-07-14
*	format-patch: autonumber by default	Brian Gernhardt	2008-10-18
*	tests: use "git xyzzy" form (t3600 - t6999)	Nanako Shiraishi	2008-09-03
*	update test case to protect am --skip behaviour	Olivier Marin	2008-07-24
*	git-am: Add colon before the subject that is printed out as being applied	Stephan Beyer	2008-07-23
*	git am --skip: clean the index while preserving local changes	Olivier Marin	2008-07-22
*	git am --abort	Nanako Shiraishi	2008-07-19