253 Коммитов

Автор	SHA1	Сообщение	Дата
Junio C Hamano	73319032c8	git-am: do not fail if 3-way fallback succeeds. ... The current one incorrectly stops there without committing. Signed-off-by: Junio C Hamano <junkio@cox.net>	2005-10-13 11:46:43 -07:00
Junio C Hamano	a1451104ac	git-am: interactive should fail gracefully. ... 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>	2005-10-12 18:31:41 -07:00
Junio C Hamano	d1c5f2a42d	Add git-am, applymbox replacement. ... 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>	2005-10-07 03:44:18 -07:00