git-cvs

I have some automated tools that are accessing a git repository through cvs and git-cvsserver . I would like these tools to be able to see the commit ID of the content that they checked out. Is this recorded somewhere in the CVS metadata directory? 来源： https://stackoverflow.com/questions/2284516/getting-commitid-or-git-describe-with-git-cvsserver-and-a-cvs-working-copy

I'm curious what's the best practice of keeping your occasional contributions to an OSS project in git (e.g., on github/bitbucket/gitlab), whilst the upstream is exclusively CVS. My take is that it's very convenient to simply commit CVS/{Entries,Repository,Root} directly into git , and then at any time and from any box, you can simply checkout your git repo (w/ git ), and then update from the real upstream with cvs up , which is exactly what I do with my OpenBSD ports-readmes fork , as well as mdocml . However, I've noticed that most people are quite surprised and puzzled to see these CVS

I'm trying to git-cvsimport several different modules from CVS, all of which are on different branches. So far I've done this (in pseudo-bash code): for each ($MODULE, $BRANCH); do git-cvsimport -p x -v -d "$CVS_REPO" "$MODULE" -o "$BRANCH" -C "$MODULE" done But that makes a different git repository for each module . How would I merge them all into one, if that's even remotely possible? VonC In theory, you could use git grafts to merge your repositories into one: See "Is there a clean way to handle two original git repositories that started with the same content?" In practice, you might want

I want to revert a particular commit in git. Unfortunately, our organization still uses CVS as a standard, so when I commit back to CVS multiple git commits are rolled into one. In this case I would love to single out the original git commit, but that is impossible. Is there an approach similar to git add --patch that would allow me to selectively edit diffs to decide which parts of a commit to revert? mipadi 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