path: root/
AgeCommit message (Collapse)Author
2006-05-21git-format-patch: now built-in.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-05-14Convert some "apply --summary" users to "diff --summary".Sean
Signed-off-by: Sean Estabrooks <> Signed-off-by: Junio C Hamano <>
2006-04-30git-format-patch: Use rfc2822 compliant date.Huw Davies
Signed-off-by: Huw Davies <> Signed-off-by: Junio C Hamano <>
2006-04-13Shell utilities: Guard against expr' magic tokens.Mark Wooding
Some words, e.g., `match', are special to expr(1), and cause strange parsing effects. Track down all uses of expr and mangle the arguments so that this isn't a problem. Signed-off-by: Mark Wooding <> Signed-off-by: Junio C Hamano <>
2006-03-07Allow format-patch to attach patchesMike McCormack
The --attach patch to git-format-patch to attach patches instead of inlining them. Some mailers linewrap inlined patches (eg. Mozilla). Signed-off-by: Junio C Hamano <>
2006-03-07Allow adding arbitary lines in the mail header generated by format-patch.Mike McCormack
Entries may be added to the config file as follows: [format] headers = "Organization: CodeWeavers\nTo: wine-patches <>\n" Signed-off-by: Junio C Hamano <>
2006-02-27git-format-patch: Always add a blank line between headers and body.Alexandre Julliard
If the second line of the commit message isn't empty, git-format-patch needs to add an empty line in order to generate a properly formatted mail. Otherwise git-rebase drops the rest of the commit message. Signed-off-by: Alexandre Julliard <> Signed-off-by: Junio C Hamano <>
2006-02-22format-patch: pretty-print timestamp correctly.Junio C Hamano
Perl is not C and does not truncate the division result. Arghh! Signed-off-by: Junio C Hamano <>
2006-02-07format-patch: Remove last vestiges of --mbox optionAndreas Ericsson
Don't mention it in docs or --help output. Remove mbox, date and author variables from Use DESCRIPTION text from man-page to update LONG_USAGE output. It's a bit silly to have two texts saying the same thing in different words, and I'm too lazy to update both. Signed-off-by: Andreas Ericsson <> Signed-off-by: Junio C Hamano <>
2006-01-25Fix git-format-patch -s to include a Signed-off-by: line...Eric W. Biederman
In the last round of bug fixes the signed-off-by line was still be generated but it was not including a signed-off-by line :( Signed-off-by: Eric W. Biederman <> Signed-off-by: Junio C Hamano <>
2006-01-15[PATCH] format-patch: always --mbox and show sane Date:Junio C Hamano
Make --mbox, --author, and --date options a no-op, and always use --mbox output, and rewrite the commit log formatting in Perl. This makes it easier to output Date: header in RFC 2822 format, so do that as well. Inspiration for this patch came from Andreas Ericsson's earlier patch. Signed-off-by: Junio C Hamano <>
2006-01-08Fix git-format-patch usage string wrt output modes.Yann Dirson
--stdout was not mentionned, and the description for the case where -o was not given was thus incomplete. Signed-off-by: Yann Dirson <> Signed-off-by: Junio C Hamano <>
2006-01-06format-patch/commit: Quote single quote in the author name properly.Junio C Hamano
Noticed by Kyle McMartin. Signed-off-by: Junio C Hamano <>
2005-12-20format-patch: make sure header and body are separated.Junio C Hamano
Since log message in a commit object is defined to be binary blob, it could be something without an empty line between the title line and the body text. Be careful to format such into a form suitable for e-mail submission. There must be an empty line between the headers and the body. Signed-off-by: Junio C Hamano <>
2005-12-14Trivial usage string
Signed-off-by: Fredrik Kuivinen <> Signed-off-by: Junio C Hamano <>
2005-12-11format-patch: use same number of digits in numbersJunio C Hamano
This would help sorting by subject in MUA work saner even though MUA is too dumb to attempt sorting numbered subjects sanely. Signed-off-by: Junio C Hamano <>
2005-11-29format-patch: run diff in C localeJunio C Hamano
Otherwise it would show incomplete line and binary markers in a locale dependent way. Signed-off-by: Junio C Hamano <>
2005-11-29format-patch: do not abuse 3-dash marker line.Junio C Hamano
Before GIT version at the end of output we used a 3-dash marker; but 3-dash marker is special and should not be overused. Instead, use "-- " which is a standard practice in e-mails to signal the beginning of trailing garbage. Signed-off-by: Junio C Hamano <>
2005-11-29format-patch: remove applies-to.Junio C Hamano
The attempt to help 3-way fallback by recording the tree object id for the entire pre-image was unnecessary, and we already have an better alternative in the form of per-blob "index" lines. Signed-off-by: Junio C Hamano <>
2005-11-26format-patch: output filename reported to stdout verbatim.Junio C Hamano
Prepending asterisk to the output was just adding noise, and making scripts like proposed git-send-mail by Andreas Ericsson do unnecessary work. Signed-off-by: Junio C Hamano <>
2005-11-25git-sh-setup: die if outside git repository.Junio C Hamano
Now all the users of this script detect its exit status and die, complaining that it is outside git repository. So move the code that dies from all callers to git-sh-setup script. Signed-off-by: Junio C Hamano <>
2005-11-21format-patch: fix two-argument special case, and make it easier to pick ↵Junio C Hamano
single commits Luben Tuikov noticed that sometimes being able to say 'git-format-patch <commit>' to format the change a single commit introduces relative to its parent is handy. This patch does not support that directly, but it makes sense to interpret a single argument "rev" to mean "rev^1..rev". With this, the backward compatibility syntaxes still apply: - "format-patch master" means "format-patch master..HEAD" - "format-patch origin master" means "format-patch origin..master" - "format-patch origin.." means "format-patch origin..HEAD" But "format-patch a b c d e" formats the changes these five commits introduce relative to their respective parents. Earlier it rejected these arguments not in "one..two" form. Signed-off-by: Junio C Hamano <>
2005-11-11Do not lose author name information to locale gotchas.Junio C Hamano
I noticed format-patch loses authorship information of Lukas' patch when I run git tools with LC_LANG set to ja_JP. It turns out that the sed script to set environment variables were not working on his name (encoded in UTF-8), which is unfortunate but technically correct. Force sed invocation under C locale because we always want literal byte semantics. Signed-off-by: Junio C Hamano <>
2005-11-07Refactored merge options into separate merge-options.txt.Jon Loeliger
Refactored fetch options into separate fetch-options.txt. Made git-merge use merge-options. Made git-fetch use fetch-options. Made git-pull use merge-options and fetch-options. Added --help option to git-pull and git-format-patch scripts. Rewrote Documentation/Makefile to dynamically determine include dependencies. Signed-off-by: Jon Loeliger <> Signed-off-by: Junio C Hamano <>
2005-11-06git-format-patch: silly typo fix.Junio C Hamano
Signed-off-by: Junio C Hamano <>
2005-11-05format-patch: "rev1.." should mean "rev1..HEAD"Junio C Hamano
"rev1.." should mean "rev1..HEAD"; git-diff users are familiar with that syntax. Signed-off-by: Junio C Hamano <>
2005-10-14format-patch: take sequence of ranges.Junio C Hamano
This enhances set of revs you can give format-patch. Originally, format-patch took either one rev, or two revs: format-patch rev1 format-patch rev1 rev2 The first format was a short-hand for "format-patch rev1 HEAD" (i.e. rev2==HEAD). What this meant was to find commits that are in branch rev2 that has not been merged to branch rev1. The above notation is still supported, but now it takes sequence of "from1..to1 from2..to2 ...". In short, the second format has become a short-hand for "format-patch rev1..rev2". Commits in to1 but not in from1, to2 but not in from2, ... are formatted as emailable patches. With this, cherry-picking from other branch can be written as: git-format-patch -k --stdout master..branch1 master..branch2 | git-am -k -3 which is generally faster than traditional cherry-pick (which always did 3-way merge) if patches apply cleanly, and still falls back on 3-way merge if some of them do not. Signed-off-by: Junio C Hamano <>
2005-10-06git-format-patch: --stdout option.Junio C Hamano
This new flag generates the mbox formatted output to the standard output, instead of saving them into a file per patch and implies --mbox. It also fixes a corner case where the commit does not have *any* message. Signed-off-by: Junio C Hamano <>
2005-10-05Record which tree the patch applies to.Junio C Hamano
Also note which version of GIT produced the patch. Signed-off-by: Junio C Hamano <>
2005-10-04Remove useless use of sed in git-format-patch.Junio C Hamano
There was a leftover use of sed that attempted to remove the commit ID output from git-diff-tree, which turned into an expensive no-op when git-diff-tree output header format changed about three months ago. Drop it. Signed-off-by: Junio C Hamano <>
2005-09-13[PATCH] Omit patches that have already been merged from format-patch output.Junio C Hamano
This switches the logic to pick which commits to include in the output from git-rev-list to git-cherry; as a side effect, 'format-patch ^up mine' would stop working although up..mine would continue to work. Signed-off-by: Junio C Hamano <>
2005-09-08Big tool rename.Junio C Hamano
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 <>