LNA/gist:0be501533c0ecccfca1e

Created April 10, 2015 20:09

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/LNA/0be501533c0ecccfca1e.js"></script>
Save LNA/0be501533c0ecccfca1e to your computer and use it in GitHub Desktop.

Download ZIP

pull branches from master into a branch that you are working on

Raw

gistfile1.txt

	git fetch origin
	git checkout master
	git merge --ff-only origin/master
	git checkout the-branch-im-working-on
	git merge --no-ff origin/master

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment