[PATCH] Added an option to cvsimport to specify email domain

The authorship info in commits created by git-cvsimport-script only contains the username of the CVS committer. This patch adds a flag -e to git-cvsimport-script that makes it possible to specify an email domain that is added to all email addresses in the commit "author" and "committer" fields.

Re: [PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

--- Junio C Hamano <[EMAIL PROTECTED]> wrote: > I'd do this slightly differently. Could you take a look at what > I have in the "proposed updates" branch, especially "Flatten > tools/ directory" commit? What I am aiming for is to have > platform specific ifeq() thing in only one place. Looks goo

[PATCH 0/2] A new merge algorithm, take 3

Hi, Here is the new version of the merge algorithm patch. The major changes compared to the previous patch are: * No more messing around with merge-cache. git-ls-files used to get the unmerged entries instead. * The python code is now contained in two files, git-merge-script and gitMergeComm

[PATCH 1/2] Add '-i' flag to read-tree to make it ignore whats in the working directory.

This will be used by the merge code. Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]> --- read-tree.c | 13 +++-- 1 files changed, 11 insertions(+), 2 deletions(-) 12d226103dc278c5d5aaf6b2dc776af3170ed233 diff --git a/read-tree.c b/read-tree.c --- a/read-tree.c +++ b/read-tree.c

[PATCH 2/2] A new merge algorithm

The new algorithm handles multiple common ancestors in a better way. Signed-off-by: Fredrik Kuivinen <[EMAIL PROTECTED]> --- Makefile |3 git-merge-script | 491 + gitMergeCommon.py | 286 +++ 3 fi

Re: [PATCH 0/2] A new merge algorithm, take 3

On Wed, 7 Sep 2005, Fredrik Kuivinen wrote: > Of the 500 merge commits that currently exists in the kernel > repository 19 produces non-clean merges with git-merge-script. The > four merge cases listed in > <[EMAIL PROTECTED]> are cleanly merged by > git-merge-script. Every merge commit which is c

Re: [PATCH 0/2] A new merge algorithm, take 3

Fredrik Kuivinen <[EMAIL PROTECTED]> writes: > I guess the need for this has decreased with Daniel's new read-tree > code. Is there any chance of getting this code merged into mainline > git? I do not think Daniel's code decreased anything. The two algorithms are solving the same problem but the

Re: [PATCH] Added an option to cvsimport to specify email domain

David K.ANegedal <[EMAIL PROTECTED]> writes: > The authorship info in commits created by git-cvsimport-script > only contains the username of the CVS committer. This patch > adds a flag -e to git-cvsimport-script that makes it > possible to specify an email domain that is added to all email >

Re: [PATCH] Add $(LIBS) and set libiconv in tools/Makefile for Darwin

Mark Allen <[EMAIL PROTECTED]> writes: > Looks good to me, Junio. There's a very small typo in your > commit though. :-) Thanks. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordom

[PATCH] Docs for git-checkout-script.

Signed-off-by: A Large Angry SCM <[EMAIL PROTECTED]> --- Documentation/git-checkout-script.txt | 23 ++- 1 files changed, 14 insertions(+), 9 deletions(-) ac5328903884c402905dd2a778ce51a00c041ffc diff --git a/Documentation/git-checkout-script.txt b/Documentation/git-che

[PATCH] Docs for git-reset-script.

Signed-off-by: A Large Angry SCM <[EMAIL PROTECTED]> --- Documentation/git-reset-script.txt | 27 +-- 1 files changed, 17 insertions(+), 10 deletions(-) e6c59b4622ab3eac9c4a74cd1571136ab586ac5a diff --git a/Documentation/git-reset-script.txt b/Documentation/git-rese

[PATCH] Docs for git-show-rev-cache.

Signed-off-by: A Large Angry SCM <[EMAIL PROTECTED]> --- Documentation/git-show-rev-cache.txt | 19 +-- 1 files changed, 9 insertions(+), 10 deletions(-) 818a8f421dfa978aa4df7103e34aeadf1ba971f5 diff --git a/Documentation/git-show-rev-cache.txt b/Documentation/git-show-rev-

[PATCH] Docs for git-build-rev-cache.

Signed-off-by: A Large Angry SCM <[EMAIL PROTECTED]> --- Documentation/git-build-rev-cache.txt | 20 ++-- 1 files changed, 10 insertions(+), 10 deletions(-) c7c6e77b9efa05b8a7b84fdf630f4ff64664872f diff --git a/Documentation/git-build-rev-cache.txt b/Documentation/git-build

Re: [PATCH] Docs for git-checkout-script.

You read my mind. I just finished documenting some other commands and was about to push things out. Thanks. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] Docs for git-checkout-script.

Actually, I'm cherry-picking the easier ones in an effort to reduce my stress about my impending move to the LA area. Hopefully you did git-diff-script, git-format-patch-script, and git-rev-parse which don't look easy to document. Junio C Hamano wrote: You read my mind. I just finished docu

Re: [PATCH] Docs for git-checkout-script.

A Large Angry SCM <[EMAIL PROTECTED]> writes: > Hopefully you did git-diff-script, git-format-patch-script, and > git-rev-parse which don't look easy to document. Not yet and not likely be in 0.99.6 but immediately after. - To unsubscribe from this list: send the line "unsubscribe git" in the b

GIT 0.99.6

Highlights == * Documentation is in much better shape. Thanks everybody. * Two grave bugs in 'git fetch' were caught and fixed. One is "Fix fetching of tags", the other is "Fix pulling into the same branch.". * We have archimport (unfortunately undocumented yet), and cvsimport is b

Tool renames.

Junio C Hamano <[EMAIL PROTECTED]> writes: > My proposal to have git-archimport.perl in the source tree and > install it as $(bindir)/git-archimport solves the editability > issues (sorry, Linus, you will have to say "em *.sh *.perl" > instead of "em *-script" if we did this) and simplifies the >

Re: Add git-version-script.

Martin Atukunda <[EMAIL PROTECTED]> writes: > This script simply reports the version of git you have installed. I wanted to ahve some way of recording the git version, but I am wondering if 'git' without parameter telling the version number would be good enough without introducing yet another scr

Re: git/cogito suggestion: tags with descriptions

Zack Brown <[EMAIL PROTECTED]> writes: > It would be great if tags also allowed a brief description to go along with > them, that would show up in cg-tag-ls. Then I could seek to a tag that's just > an easy-to-type version number, and still have an idea of what's significant > about that version b

Re: git/gitweb - feature request: Add description to the branches.

A Large Angry SCM <[EMAIL PROTECTED]> writes: > Santi B.ANijar wrote: > [...] >> One thing I'm missing is a way to describe a branch. It can >> be >> done in the $GIT_DIR/description, the first line for the whole >> repository and the rest for the branches. So description

git-stripspace unfairly accused of being undocumented.

Junio, Looking over the latest commits I just noticed the "no documentation" section in git.txt lists git-stripspace in error. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-

Re: patches

Patrick Mauritz <[EMAIL PROTECTED]> writes: I would have appreciated if you said "Solaris portability patch" or somesuch on the subject line. > diff -ur git-core-0.99.4.orig/convert-cache.c git-core-0.99.4/convert-cache.c > --- git-core-0.99.5.orig/convert-cache.c Wed Aug 17 09:55:00 2005 >

Re: Add git-version-script.

Junio C Hamano wrote: Martin Atukunda <[EMAIL PROTECTED]> writes: This script simply reports the version of git you have installed. I wanted to ahve some way of recording the git version, but I am wondering if 'git' without parameter telling the version number would be good enough without int

Re: git/cogito suggestion: tags with descriptions

Junio C Hamano wrote: Zack Brown <[EMAIL PROTECTED]> writes: It would be great if tags also allowed a brief description to go along with them, that would show up in cg-tag-ls. Then I could seek to a tag that's just an easy-to-type version number, and still have an idea of what's significant abo

[PATCH] Do not create bogus branch from flag to git branch

If you run `git branch --help', you will unexpectedly have created a new branch named "--help". This simple patch adds logic and a usage statement to catch this and similar problems, and adds a testcase for it. Signed-off-by: Amos Waterland <[EMAIL PROTECTED]> --- git-branch-script | 16

[PATCH] Re: Add git-version-script.

Add version string to git. Signed-off-by: Martin Atukunda <[EMAIL PROTECTED]> --- Makefile |3 ++- git.in | 25 + 2 files changed, 27 insertions(+), 1 deletions(-) create mode 100755 git.in 6a9edfa27c41b7845bfd519e275c24d7e36ad702 diff --git a/Makefile b/Makefi

gitweb feature request: tarball for each commit

With Archzoom, when looking at a particular commit/cset you get a small "[tarball]" link that does an 'export' of the whole tree at that patchlevel and tars it up for the user. It's heavy on the server and bandwidth, but if you can afford it, it is mighty useful to push out patches immediately to n

Re: [PATCH 0/2] A new merge algorithm, take 3

On Wed, Sep 07, 2005 at 02:33:42PM -0400, Daniel Barkalow wrote: > On Wed, 7 Sep 2005, Fredrik Kuivinen wrote: > > > Of the 500 merge commits that currently exists in the kernel > > repository 19 produces non-clean merges with git-merge-script. The > > four merge cases listed in > > <[EMAIL PROTEC