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

	Commit message (Expand)	Author	Age
*	builtin-am: remove redirection to git-am.sh	Paul Tan	2015-08-04
*	Merge branch 'pt/am-foreign'	Junio C Hamano	2015-08-03
\|\
\| *	am: teach mercurial patch parser how to read from stdin	Paul Tan	2015-06-15
\| *	am: use gmtime() to parse mercurial patch date	Paul Tan	2015-06-15
\| *	am: teach StGit patch parser how to read from stdin	Paul Tan	2015-06-15
* \|	Revert "git-am: add am.threeWay config variable"	Junio C Hamano	2015-07-24
* \|	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
* \| \|	Merge branch 'rl/am-3way-config'	Junio C Hamano	2015-06-24
\|\ \ \
\| * \| \|	git-am: add am.threeWay config variable	Remi Lespinet	2015-06-04
\| * \| \|	git-am.sh: fix initialization of the threeway variable	Remi Lespinet	2015-06-04
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'nd/multiple-work-trees'	Junio C Hamano	2015-05-11
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	*.sh: avoid hardcoding $GIT_DIR/hooks/...	Nguyễn Thái Ngọc Duy	2014-12-01
\| \|/
* \|	git-am: add --message-id/--no-message-id	Paolo Bonzini	2014-11-25
\|/
*	Merge branch 'jl/nor-or-nand-and'	Junio C Hamano	2014-04-08
\|\
\| *	comments: fix misuses of "nor"	Justin Lebar	2014-03-31
* \|	git-am.sh: use the $(...) construct for command substitution	Elia Pinto	2014-03-25
* \|	am: add the --gpg-sign option	Nicolas Vigier	2014-02-03
* \|	am: parse options in stuck-long mode	Nicolas Vigier	2014-02-03
* \|	git-sh-setup.sh: add variable to use the stuck-long mode	Nicolas Vigier	2014-02-03
\|/
*	Merge branch 'jk/replace-perl-in-built-scripts'	Junio C Hamano	2013-12-05
\|\
\| *	use @@PERL@@ in built scripts	Jeff King	2013-10-29
* \|	am: replace uses of --resolved with --continue	Kevin Bracey	2013-06-27
* \|	am: handle stray $dotest directory	Ramkumar Ramachandra	2013-06-17
* \|	am: return control to caller, for housekeeping	Ramkumar Ramachandra	2013-05-12
* \|	am: tighten a conditional that checks for $dotest	Ramkumar Ramachandra	2013-05-12
* \|	git-am: show the final log message on "Applying:" indicator	Simon Ruderich	2013-03-21
\|/
*	Merge branch 'jc/fake-ancestor-with-non-blobs'	Junio C Hamano	2013-02-05
\|\
\| *	git-am: record full index line in the patch used while rebasing	Junio C Hamano	2013-01-31
* \|	Merge branch 'dl/am-hg-locale'	Junio C Hamano	2013-01-28
\|\ \ \| \|/ \|/\|
\| *	am: invoke perl's strftime in C locale	Dmitry V. Levin	2013-01-18
* \|	Merge branch 'nd/am-i18n-fix'	Junio C Hamano	2012-09-07
\|\ \
\| * \|	am: quote string for translation before passing to eval_gettextln	Nguyễn Thái Ngọc Duy	2012-08-22
* \| \|	Merge branch 'jx/i18n-1.7.11'	Junio C Hamano	2012-07-31
\|\ \ \
\| * \| \|	Remove dead code which contains bad gettext block	Jiang Xin	2012-07-26
\| * \| \|	i18n: am: mark more strings for translation	Jiang Xin	2012-07-26
\| * \| \|	i18n: rebase: mark messages for translation	Jiang Xin	2012-07-25
* \| \| \|	Merge branch 'pg/maint-1.7.9-am-where-is-patch'	Junio C Hamano	2012-07-22
\|\ \ \ \ \| \|/ / / \|/\| / / \| \|/ /
\| * \|	am: indicate where a failed patch is to be found	Paul Gortmaker	2012-07-13
\| * \|	Merge branch 'jc/am-3-nonstandard-popt' into maint	Junio C Hamano	2012-03-12
\| \|\ \
* \| \| \|	am: don't call mailinfo if $rebasing	Martin von Zweigbergk	2012-06-26
* \| \| \|	am --rebasing: get patch body from commit, not from mailbox	Martin von Zweigbergk	2012-06-26
* \| \| \|	Merge branch 'jc/am-report-3way'	Junio C Hamano	2012-04-20
\|\ \ \ \
\| * \| \| \|	am -3: list the paths that needed 3-way fallback	Junio C Hamano	2012-03-28
* \| \| \| \|	Merge branch 'jb/am-include'	Junio C Hamano	2012-04-20
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|