git merge different repositories?

If you have two projects, proj1 and proj2 and want to merge changes of proj1 into proj2, you would do it like this: # in proj2: git remote add proj1 path/to/proj1 git fetch proj1 git merge proj1/master # or whichever branch you want to merge I believe this does the same thing as what you … Read more

How to import svn branches and tags into git-svn?

You’ll need several steps. supply proper trunk, branches and tags folder names and fetch svn repo: git svn init -t tags -b branches -T trunk https://mysvn.com/svnrepo git svn fetch Since tags in svn are real branches, create git tags from tag branches: git for-each-ref –format=”%(refname:short) %(objectname)” refs/remotes/tags | cut -d / -f 3- | while … Read more

git-svn: what’s the equivalent to `svn switch –relocate`?

This handles my situation pretty well: https://git.wiki.kernel.org/index.php/GitSvnSwitch I cloned using the file:// protocol, and wanted to switch to the http:// protocol. It is tempting to edit the url setting in the [svn-remote “svn”] section of .git/config, but on its own this does not work. In general you need to follow the following procedure: Switch the … Read more