1
0
mirror of https://github.com/git/git.git synced 2024-10-05 19:41:52 +02:00
Commit Graph

58 Commits

Author SHA1 Message Date
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>
2005-11-08 01:23:53 -08:00
Junio C Hamano
f89ad67fb0 Add [v]iew patch in git-am interactive.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-25 23:43:59 -07:00
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>
2005-10-25 23:35:37 -07:00
Junio C Hamano
2c674191d5 Fix missing exports in git-am
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-20 22:31:56 -07:00
Junio C Hamano
22943f1a52 Update git-apply to use C-style quoting for funny pathnames.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-17 17:41:54 -07:00
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