aseure/manual-merge-and-rebase.sh

Created December 6, 2017 16:01

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/aseure/7d2c31f2816d0bb2c879d0ba9a8de184.js"></script>
Save aseure/7d2c31f2816d0bb2c879d0ba9a8de184 to your computer and use it in GitHub Desktop.

Download ZIP

Manual "Merge and rebase"

Raw

manual-merge-and-rebase.sh

	git checkout my-new-feat
	git rebase master
	git checkout master
	git merge my-new-feat --ff

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