- 07 11月, 2005 1 次提交
-
-
由 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: NJon Loeliger <jdl@freescale.com> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 06 11月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 05 11月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
"rev1.." should mean "rev1..HEAD"; git-diff users are familiar with that syntax. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 14 10月, 2005 1 次提交
-
-
由 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: NJunio C Hamano <junkio@cox.net>
-
- 07 10月, 2005 1 次提交
-
-
由 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: NJunio C Hamano <junkio@cox.net>
-
- 05 10月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
Also note which version of GIT produced the patch. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 04 10月, 2005 1 次提交
-
-
由 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: NJunio C Hamano <junkio@cox.net>
-
- 13 9月, 2005 1 次提交
-
-
由 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: NJunio C Hamano <junkio@cox.net>
-
- 08 9月, 2005 1 次提交
-
-
由 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: NJunio C Hamano <junkio@cox.net>
-
- 20 8月, 2005 1 次提交
-
-
由 Marco Costalba 提交于
In case of a commit with an empty message there is no mandatory empty line between headers and body [jc: This makes --mbox output valid even when the commit message does not have anything but its first line, which the one I wrote botched. One side-effect is that it adds an extra blank line at the end even if it has more than one lines, which will be eaten by the receiving end. As Marco says, this is a stop-gap measure. This script needs to be split into two, one that gets the format specifier and a commit ID to write to its standard output, and another that drives that one reading from rev-list. I'll fix things properly when that happens by rewriting the former part in Perl or something more reasonable than the current shell, sed and grep mishmash.] Signed-off-by: NMarco Costalba <mcostalba@yahoo.it> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 18 8月, 2005 1 次提交
-
-
由 Marco Costalba 提交于
Avoid that git-format-patch writes out patch series information on stderr when there are no errors Signed-off-by: NMarco Costalba <mcostalba@yahoo.it> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 17 8月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
Introduces --keep-subjects flag to tell it not to munge the first line of the commit message. Running "git applymbox" on the output from "git format-patch -m -k" would preserve the original commit information better this way. At the same time, prefix Subject: on the first line of the commit, to help people cut©. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 16 8月, 2005 1 次提交
-
-
由 Johannes Schindelin 提交于
Since git-commit-script has a "--signoff" option, use that in git-format-patch-script, too (and since partial option names are supported,"--sign" is still valid). Also, if the message already contains the S-O-B line, silently ignore the "--signoff" request. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 13 8月, 2005 1 次提交
-
-
由 Johannes Schindelin 提交于
This adds the option "--sign" to git-format-patch-script which adds a Signed-off-by: line automatically. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 10 8月, 2005 2 次提交
-
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Although these commands take only begin and end, not necessarily generic SHA1 expressions rev-parse supports, supporting a..b notation is good for consistency. This commit adds such without breaking backward compatibility. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 02 8月, 2005 1 次提交
-
-
由 Johannes Schindelin 提交于
Some implementations of wc pad the line number with white space, which expr does not grok as a number. Signed-off-by: NJohannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 23 7月, 2005 2 次提交
-
-
由 Junio C Hamano 提交于
Add --mbox option to export patches in a format resembling UNIX mbox, so that later they can be concatenated and fed to applymbox. Add --check to look for lines that introduce bogus whitespaces. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
由 Junio C Hamano 提交于
- avoid duplicating [PATCH] in the commit message body if the original commit has it already (happens for commits done from mails via applymbox). - check if the commit author is different from the one who is running the script, and emit an appropriate "From:" and "Date: " lines to the output. - with '--date', emit "Date: " line to preserve the original author date even for the user's own commit. - teach mailinfo to grok not just "From: " but "Date: ". The patch e-mail output by format-patch starts with the first line from the original commit message, prefixed with [PATCH], and optionally a From: line if you are reformatting a patch obtained from somebody else, a Date: line from the original commit if (1) --date is specified or (2) for somebody else's patch, and the rest of the commit message body. Expected use of this is to move the title line from the commit to Subject: when sending it via an e-mail, and leave the From: and the Date: lines as the first lines of your message. The mailinfo command has been changed to read Date: (in addition to From: it already understands) and do sensible things when running applymbox. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 09 7月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
If it is fed a commit with more than one leading blank lines, the sed scripts git-format-patch-script used looped forever. Using git-stripspace upfront makes the sed script somewhat simpler to work around this problem. Also use git-rev-parse so that we can say $ git-format-patch-script HEAD^^^^ to prepare the latest four patches for e-mail submission. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 08 7月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
This is the script I use to prepare patches for e-mail submission. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-