kernel/git - git - PowerEL Git System

Tree: e8cc80d039

Author	SHA1	Message	Date
Junio C Hamano	087b6742fc	git-am: --binary; document --resume and --binary. Now git-apply can grok binary replacement patches, give --binary flag to git-am. As a safety measure, this is not by default enabled, so that you do not let malicious e-mailed patch to replace an arbitrary path with just a couple of lines (diff index lines, the filename and string "Binary files "...) by accident. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	0c15cc921a	git-am: --resolved. After failed patch application, you can manually apply the patch (this includes resolving the conflicted merge after git-am falls back to 3-way merge) and run git-update-index on necessary paths to prepare the index file in a shape a successful patch application should have produced. Then re-running git-am --resolved would record the resulting index file along with the commit log information taken from the patch e-mail. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	4bfb6b62ff	git-am: do not lose already edited final-commit when resuming. The last round stopped munging the patch when resuming, but failed to preserve final-commit. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	f89ad67fb0	Add [v]iew patch in git-am interactive. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	271440e3b6	git-am: make it easier after fixing up an unapplicable patch. 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>	19 years ago
Junio C Hamano	2c674191d5	Fix missing exports in git-am Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	22943f1a52	Update git-apply to use C-style quoting for funny pathnames. Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
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>	19 years ago
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>	19 years ago
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>	19 years ago