On Fri, Oct 12, 2007 at 04:36:29PM -0400, mfwitten@xxxxxxx wrote: > (4) Update my git working tree from CVS (at some later time). > > => cd ../work > => git cvsimport -a -k -v -r cvs -C . module > > [PROBLEM] > > git-cvsimport creates new hash IDs for the same ol' commits. > > [...] > Therefore, when the updated 'cvs' remote branches are merged into > my local branches, git treats the commits I made with cvsexportcommit > as separate history; thus, history is duplicated and merge commits > appear where they shouldn't. You are presumably doing a 'git-pull' on the cvsimport-ed commits. Try doing a git-rebase, which will filter out commits which make the same changes. Yes, it means throwing away your original commits, but the new ones should be morally equivalent (and are now the "official" upstream of the CVS repository). -Peff - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
