Last active
October 21, 2015 14:54
-
-
Save pablodgonzalez/b6c9d209353b8a5a9903 to your computer and use it in GitHub Desktop.
git utils
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git filter-branch --prune-empty --subdirectory-filter sources/dir/ master |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git checkout origin | |
| git merge -s ours destiny | |
| git checkout destiny | |
| git merge origin | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment