noahpresler/reset.sh

Created July 20, 2017 19:16

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

Download ZIP

Create new branch with old commits before history rewrite

Raw

	git checkout -b {NEWBRANCHNAME} staging
	git log --no-merges noah_messed_up..{OLDBRANCHNAME} --format=format:%H \| git cherry-pick --stdin

Author

noahpresler commented Jul 20, 2017 •

edited

Loading

Make a copy of your repository directory to be safe

Set {NEWBRANCHNAME} to the name of the new branch which will have your changes
Set {OLDBRANCHNAME} to the name of the branch you wish to reset

After running this and dealing with any conflicts, do:

git log **{NEWBRANCHNAME}..origin/staging**

This compares the commits on the new branch to staging. It should only have your commits you want merged.

git diff {NEWBRANCHNAME} origin/staging

This will show you the diff between the branches. Make sure its the diff you want in a PR.

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