I'm on a project working with an outside shop right now, and of course they have their own workflow. I always learn something new from these experiences and this is no exception.
I've used git pull since I started working with GIT to pull down the lastest from a repo. This week I was introduced to git up which will stash any changes you haven't committed, pull the repo, and unstash those changes.
From the GitHub repo:
git pull has two problems:
- It merges upstream changes by default, when it's really more polite to rebase over them, unless your collaborators enjoy a commit graph that looks like bedhead.
- It only updates the branch you're currently on, which means git push will shout at you for being behind on branches you don't particularly care about right now.
Solve them once and for all.
And installation is as easy as gem install git-up (I hope it's obvious that Ruby is required). Then when you're ready to pull down the repo, just type git up in the command line.
Helpful link to the GitHub repo for git-up: https://github.com/aanand/git-up