With our current setup you always have to enter the branch name (ie:
git pull origin feature-branch” when doing a pull. I’ve already made the mistake of pulling from one branch into another, accidentally merging two branches with two very different releases. I’d like to avoid this by configuring Git so that simply typing
git pull will pull the current branch you’re in.
How do I do this?
You can create a tracking branch. From the Git Book (http://git-scm.com/book/en/Git-Branching-Remote-Branches):
When you clone a repository, it generally automatically creates a
masterbranch that tracks
origin/master. That’s why
git pullwork out of the box with no other arguments. However, you
can set up other tracking branches if you wish — ones that don’t track
originand don’t track the
masterbranch. The simple
case is the example you just saw, running
git checkout -b [branch] [remotename]/[branch]. If you have Git
version 1.6.2 or later, you can also use the
$ git checkout --track origin/serverfix Branch serverfix set up to track remote branch refs/remotes/origin/serverfix. Switched to a new branch "serverfix"
Answered By – Karthik Ramachandran