Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- A--B--C--D--E--F--G--H
- |
- | /
- /
- X--Y--Z
- A--B--C--D--E--F--G--H
- | /
- | / ___/
- / /
- X--Y--Z
- A--B--C--D--E--F--G--H--I--J--K master
- |
- | /
- /
- X--Y--Z upstream
- git branch temp
- git reset --hard E
- GIT_AUTHOR_DATE="..." GIT_COMMIT_DATE="..." git merge Z
- git cherry-pick G..K
- A--B--C--D--E--F--G--H--I--J--K master
- | /
- | / ___/
- / /
- X--Y--Z upstream
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement