Can I copy a Git working copy onto another machine?
You can copy it, everything is inside the .git folder and is not dependant on anything else.
git-svn
Author not defined when importing SVN repository into Git
I’ve had the same issue when trying to execute this on Windows. It turned out that the encoding of the file that I stored the authors in was set to UTF-8 instead of UTF-8 without BOM. As the “with BOM” version adds some additional bytes to the beginning of the file, the first author in … Read more
Git svn rebase : checksum mismatch
This solution was the only one that worked for me: See what was the revision number of the last change on the file: git svn log chrome/test/functional/search_engines.py Reset svn to be closest parent before that revision: git svn reset -r62248 -p Do a git svn fetch! Dance at your success.
How to use git-svn to checkout only trunk and not branches and tags?
Edit: I misread the question and answered what I thought you were asking, not what you actually asked. To clone just the trunk Cloning a single Subversion directory is easy, and it actually doesn’t matter which directory you clone. Just don’t specify any of the “layout” arguments, and give the path to the trunk directly: … Read more
Add svn repo to existing git repo?
After searching last night, I have finally found the answer: http://i-nz.net/2009/01/15/selective-import-of-svn-branches-into-a-gitgit-svn-repository/ It seems that you have to actually go in and manually edit the .git/config file in order to add an svn branch to an existing git repo. So according to these instructions I would have to add an entry for each branch.
Add new commit to the existing Git tag
You can’t put a new commit into an existing tag without breaking an important Git guideline: Never(*) modify commits that you have published. Tags in Git aren’t meant to be mutable. Once you push a tag out there, leave it alone. You can, however, add some changes on top of v1.1 and release something like … Read more
warning: refname ‘xxx’ is ambiguous when using git-svn
If you pass the –prefix=svn/ flag to the git svn clone command, then all of the Subversion branches would be named like remotes/svn/branchname. If this is acceptable to you, it fixes the “refname is ambiguous” warning. It also gives you a nice way of referring to the remote svn branches, as in for instance if … Read more
Retroactively Correct Authors with Git SVN?
Start out by seeing what you’ve got to clean up: git shortlog -s For each one of those names, create an entry in a script that looks like this (assuming you want all the authors and committers to be the same): #!/bin/sh git filter-branch –env-filter ‘ n=$GIT_AUTHOR_NAME m=$GIT_AUTHOR_EMAIL case ${GIT_AUTHOR_NAME} in user1) n=”User One” ; … Read more
Keep git history when splitting a file
The general rule to maintaining blame history is to make a separate move commit first before any edits. It has been my experience that this allows git blame to work without the need for the -C option. So in the case of splitting the file up into new files, this can be done in two … Read more
Error with git rebase (“could not apply…”)
As a reminder to myself on how to resolve this: The error message is not very informative. If you type git rebase –continue you realize the error is because of a merge conflict that git cannot resolve by itself, and needs your help. To see what files have conflicts, type git status Resolve the merge … Read more