Comments on: Assembling bits of history with git

By: Sam Vilain

Sam Vilain — Fri, 27 Jul 2007 20:01:27 +0000

Note git-filter-branch is the same as the script in cogito called cg-admin-rewritehist, which is stable and extremely servicable.

When it comes to doing history touch-ups and integrating history from lots of different sources, I’d call git-filter-branch indispensable. Get yourself a 1.5.3 RC version, or use the version of the tool in cogito.

By: Buxy

Buxy — Tue, 24 Jul 2007 19:31:10 +0000

For other people who wonder about parsecvs (like I just did), you can find that software here: http://gitweb.freedesktop.org/?p=users/keithp/parsecvs.git

By: Buxy

Buxy — Tue, 24 Jul 2007 19:10:05 +0000

siprbaum: I knew of grafts file, and it’s convenient to use. But as you mentioned it’s repo-specific, a “git clone” won’t download the graft file. That’s why I went for the rebase approach.

I’ll look into git-filter-branch once it’s in a stable release of git. There’s no hurry any more for me now…

By: Anonymous

Anonymous — Tue, 24 Jul 2007 17:51:09 +0000

git-cvsimport has known bugs, and frequently mangles history. I highly recommend checking its results carefully, or better yet not using it. Use parsecvs for a high-quality import.

By: siprbaum

siprbaum — Tue, 24 Jul 2007 17:23:10 +0000

You could also use a graft file (.git/info/grafts) where you could overwrite the parenthood of a commit. This mechanism is also used to connect the pre-git version of the linux kernel (bk import; <= 2.6.11) with the version managed in git.

After that, you could also use git-filter-branch (AFAIK unreleased; but in the -rc version) to alter the history permant. (graft files are repo local).