Commit Graph

5 Commits

Author SHA1 Message Date
Linus Torvalds
d571c2be99 [PATCH] git-applymbox: verify that index is clean
This makes git-applymbox verify that the index matches the current HEAD
before it starts applying patches.

Otherwise, you might have updated the index with unrelated changes, and
the first patch will commit not just the patch from the mbox, but also any
changes you had in your index.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-18 16:26:50 -07:00
Junio C Hamano
6bff6a6068 Teach applymbox to keep the Subject: line.
This corresponds to the -k flag to git format-patch --mbox
option.  The option should probably not be used when applying a
real e-mail patch, but is needed when format-patch and applymbox
pair is used for cherrypicking.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-16 22:22:35 -07:00
Junio C Hamano
b50abe8843 git-applymbox: allow retrying after fixing up.
After failing to apply a patch, when operating under -q (query)
flag, give the user an opportunity to fix up the patch in a
separate window and retry.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-05 01:39:15 -07:00
Linus Torvalds
154d3d2dd2 Fix up applymbox script for the addition of "git-" prefix
Ehh, it works much better that way ;)
2005-07-23 20:28:34 -07:00
Linus Torvalds
fd1fcd9f57 Rename the "tools" programs to also have the "git-" prefix
Hey, people are using them, and we have an install target for them, so
make sure that we can actually install them sanely without disturbing
the namespace.
2005-07-23 18:46:27 -07:00