Created
May 25, 2011 10:46
-
-
Save vrinek/990771 to your computer and use it in GitHub Desktop.
find out how a file has changed when you get a conflict in "rebase master"
This file contains 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 log -p --color $(git merge-base master branch)...master path/to/file.rb |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment