What I have done in the past is: Import the CVS repository Using: $ git cvsimport -C target-cvs -r cvs -k -vA authors-file.txt -d $CVSROOT module Where: target-cvs is the directory to keep my local copy of the repository. cvs is the name to use for referencing the remote repository. So, I will have cvs/master, … Read more
I wrote up an answer to a similar question here. This works suprisingly well when you’re forced to continue to push changes into a central CVS repository.
Fortunately for those of us who are still forced to use CVS, git provides pretty good tools to do exactly what you’re wanting to do. My suggestions (and what we do here at $work): Creating the Initial Clone Use git cvsimport to clone the CVS revision history into a git repository. I use the following … Read more
Use the –no-commit (-n) option to git revert, then unstage the changes, then use git add –patch: $ git revert -n $bad_commit # Revert the commit, but don’t commit the changes $ git reset HEAD . # Unstage the changes $ git add –patch . # Add whatever changes you want $ git commit # … Read more