summaryrefslogtreecommitdiff
path: root/tools/git-applymbox
AgeCommit message (Collapse)Author
2005-08-18[PATCH] git-applymbox: verify that index is cleanLinus Torvalds
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-17Teach applymbox to keep the Subject: line.Junio C Hamano
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-05git-applymbox: allow retrying after fixing up.Junio C Hamano
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-07-24Fix up applymbox script for the addition of "git-" prefixLinus Torvalds
Ehh, it works much better that way ;)
2005-07-24Rename the "tools" programs to also have the "git-" prefixLinus Torvalds
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.