Albert Puig apuignav

apuignav / git-rebase-upstream

Last active December 14, 2015 05:58

Git rebase to forked github repo, assumed to be named upstream

	# Fetch all the branches of that remote into remote-tracking branches,
	# such as upstream/master:
	git fetch upstream

	# Make sure that you're on your master branch:
	git checkout master

	# Rewrite your master branch so that any commits of yours that
	# aren't already in upstream/master are replayed on top of that
	# other branch: