From: Michael J Gruber Date: Sat, 27 Mar 2010 17:22:29 GMT Subject: Re: Help with rebase after cvsimport Message-ID: <4BAE3ED5.6080808@drmicha.warpmail.net> In-Reply-To: Brice Ruth venit, vidit, dixit 26.03.2010 17:10: > So, when you write "Note that by doing that you basically discard your > version of commits which made the git-cvs-git roundtrip" - I will lose > the individual commits I made locally and I'll just see the *one* > exportcommit that I made for my local changes, is that right? The way I use git-cvs, I have one cvs commit per git commit. Are you using it differently? The rebase will discard those commits whose patch text is already "present" on the branch. I assume that for a cumulative patch this means it's not ignored - in that case the rebase won't buy you anything. Michael