I am looking into using git on a massive scale. I was hoping to increase adoption and make things easier by calling the master branch trunk.
This can and will give
You can rename the master branch trunk as Greg has suggested, or you can also create a trunk that is a symbolic reference to the master branch so that both git and svn users have the 'main' branch that they are used to.
git symbolic-ref refs/heads/trunk refs/heads/master
Note that trunk isn't a first class citizen. If you checkout trunk
and perform a git status
you will actually be on master
, however you can use the trunk
command in all places that you use the branch name (log, merge, etc.).