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

	Commit message (Collapse)	Author	Age
*	git-am: do not lose already edited final-commit when resuming.	Junio C Hamano	2005-11-08
\| \| \| \| \| \| \|	The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Add [v]iew patch in git-am interactive.	Junio C Hamano	2005-10-25
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	git-am: make it easier after fixing up an unapplicable patch.	Junio C Hamano	2005-10-25
\| \| \| \| \| \| \|	Instead of having the user to edit the mail message, let the hand merge result stored in .dotest/patch and continue, which is easier to manage. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Fix missing exports in git-am	Junio C Hamano	2005-10-20
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Update git-apply to use C-style quoting for funny pathnames.	Junio C Hamano	2005-10-17
\| \| \| \|	Signed-off-by: Junio C Hamano <junkio@cox.net>
*	git-am: do not fail if 3-way fallback succeeds.	Junio C Hamano	2005-10-13
\| \| \| \| \| \|	The current one incorrectly stops there without committing. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	git-am: interactive should fail gracefully.	Junio C Hamano	2005-10-12
\| \| \| \| \| \| \| \|	When feeding patches from standard input, and --interactive is specified, quit, so that the user can re-run the command, instead of infinitely looping. Signed-off-by: Junio C Hamano <junkio@cox.net>
*	Add git-am, applymbox replacement.	Junio C Hamano	2005-10-07
	It reorganizes the code and also has saner command line options syntax. Unlike git-applymbox, it can take more than one mailbox file from the command line, as well as reading from the standard input when '-' is specified. Signed-off-by: Junio C Hamano <junkio@cox.net>