The reality with most projects is I typically work with origin master only. Only 10% of my projects is doing actual branching. (Yea, there probably should be an improvement on that figure.)
Here’s how to merge origin master by default.
[code lang=“bash”]git config branch.master.remote origin
git config branch.master.merge refs/heads/master[/code]
You never have to see the following message again:
[code lang=“bash”]kahwee-mba:gladlycode.com kahwee$ git pull
You asked me to pull without telling me which branch you
want to merge with, and ‘branch.master.merge’ in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. ‘git pull
See git-pull(1) for details.
If you often merge with the same branch, you may want to
use something like the following in your configuration file:
[remote "<nickname>"] url = <url> fetch = <refspec>
See git-config(1) for details.[/code]