kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Petr Baudis	42e2cba204	Brief documentation for the mysterious git-am script The git-am script is nowhere called and nowhere (including itself) explained, and the name isn't helpful either. For those like me who will wonder what is it about, add some documentation stub for it to the documentation. I probably got something wrong and I don't feel like investigating all the options - this is just kind of "emergency" docs. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>	19 years ago
Junio C Hamano	e11fc02066	mailsplit: -d<prec> Instead of the default 4 digits with leading zeros, different precision can be specified for the generated filenames. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	4ebe63dfe6	Clean mail files after dealing with them. When you are applying 200 mails in sequence, .dotest/ directory will be littered with many messsages, and when the patch in one of them fails to apply, it is not obvious which message was being processed. Remove the one that has been already dealt with, so that the last failed one is found typically as the lowest numbered split message. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	47f0b6d5d4	Fall back to three-way merge when applying a patch. After git-apply fails, attempt to find a base tree that the patch cleanly applies to, and do a three-way merge using that base tree into the current index, if .dotest/.3way file exists. This flag can be controlled by giving -m flag to git-applymbox command. When the fall-back merge fails, the working tree can be resolved the same way as you would normally hand resolve a conflicting merge. When making commit, use .dotest/final-commit as the log message template. Or you could just choose to 'git-checkout-index -f -a' to revert the failed merge. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	215a7ad1ef	Big tool rename. As promised, this is the "big tool rename" patch. The primary differences since 0.99.6 are: (1) git-*-script are no more. The commands installed do not have any such suffix so users do not have to remember if something is implemented as a shell script or not. (2) Many command names with 'cache' in them are renamed with 'index' if that is what they mean. There are backward compatibility symblic links so that you and Porcelains can keep using the old names, but the backward compatibility support is expected to be removed in the near future. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	597c9cc540	Flatten tools/ directory to make build procedure simpler. Also make platform specific part more isolated. Currently we only have Darwin defined, but I've taken a look at SunOS specific patch (which I dropped on the floor for now) as well. Doing things this way would make adding it easier. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	07a95d0ed3	git-applymbox: fix '-c'. Earlier round `b50abe8843` broke it by carelessly rewriting the main loop. Signed-off-by: Junio C Hamano <junkio@cox.net>	20 years ago
Junio C Hamano	d4a9ce78f6	mailinfo and applymbox updates This attempts to minimally cope with a subset of MIME "features" often seen in patches sent to our mailing lists. Namely: - People's name spelled in characters outside ASCII (both on From: header and the signed-off-by line). - Content-transfer-encoding using quoted-printable (both in multipart and non-multipart messages). These MIME features are detected and decoded by "git mailinfo". Optionally, with the '-u' flag, the output to .info and .msg is transliterated from its original chaset to utf-8. This is to encourage people to use utf8 in their commit messages for interoperability. Applymbox accepts additional flag '-u' which is passed to mailinfo. Signed-off-by: Junio C Hamano / 濱野純 <junkio@cox.net>	20 years ago
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>	20 years ago
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>	20 years ago
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>	20 years ago
Linus Torvalds	154d3d2dd2	Fix up applymbox script for the addition of "git-" prefix Ehh, it works much better that way ;)	20 years ago
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.	20 years ago
Junio C Hamano	3727531899	[PATCH] tools/applymbox: allow manual fixing and continuing after a failure. With "-c .dotest/0002" flag, the applymbox command can be told to use existing .dotest/patch file after hand-fixing the patch conflicts for the second patch in the mailbox, and continue on from that message, skipping the already applied first patch in .dotest/0001. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>	20 years ago
Linus Torvalds	c5f7674a97	Prepare git-tools for merging into the main git archive Rename into a "tools" subdirectory, and change name of "dotest" to "applymbox". Remove stripspace (which was already copied into git) and cvs2git (which was likewise already copied into git, and then replaced by a much better perl version). All of this was brought on by Ryan Anderson shaming me into it. Thanks. I guess.	20 years ago
Linus Torvalds	a196d8d423	Avoid doing the "filelist" thing, since "git-apply" picks up the files automatically ..and git-apply does a lot better job at it anyway. Also, we break the comment/diff on a line that starts with "diff -", not just on the "---" line. Especially for git diffs, we actually want that line in the diff. (We should probably also break on "Index: ..." followed by "=====")	20 years ago
Linus Torvalds	8c7b86632c	Add "stripspace" program to clean up email commentary Remove multiple empty lines, and empty lines at beginning and end.	20 years ago
James Bottomley	ad4e9ce4f9	[PATCH] make dotest more amenable to commit message editing This makes "dotest" a lot nicer to sue, especially for people who were used to editing the commit comments after-the-fact in BK, which git doesn't apply. he syntax is dotest [-q] mailbox [signoff] so the command line operates exactly as you're used to. If you supply the -q it will query before applying (I also added the [a]pply all the rest option). If the signoff file is absent, no signoff line gets added. There's also one addition in this: a checkout-cache line. I added that for poor saps like me whose laptop takes minutes to checkout a full build tree, so I can run dotest in a directory with no checked out files.	20 years ago
Linus Torvalds	853916ff7f	Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.	20 years ago

5 Commits (565cb991147d7bf7945ed50d9d5e1e84ade35572)