Skip to content

Instantly share code, notes, and snippets.

View daveworth's full-sized avatar
🔬
Science!

David E Worth daveworth

🔬
Science!
View GitHub Profile
@daveworth
daveworth / git selective merge
Created May 9, 2012 19:20 — forked from katylava/git-selective-merge.md
git selective merge
Example: You have a branch 'refactor' that is quite different from master. You can't merge all of the
commits, or even every hunk in any single commit or master will break, but you have made a lot of
improvements there that you would like to bring over to master.
# on master
> git branch -m original_refactor refactor # <== completely optional but part of my flow
> git co -b temp
# on temp
> git merge --no-commit --no-ff refactor