git-svn: reset tracking for master

Question

I\'m using git-svn to work with an SVN repository. My working copies have been created using git svn clone -s http://foo.bar/myproject so that my w

Answer 1

We have successfully used git merge --squash in git-svn feature branch development. The problem with git-svn is that while your local git-svn clone can store the merge information, once you dcommit to the svn repository, it is lost.

So for other (git-)svn users the merge commits look just like plain commits. The squash is good for the same thing as git merge --no-ff (eg. producing a merge commit on master), but it also includes a list of the actual commits made in the branch being merged, which would otherwise be lost when dcommitting.