Skip to content

Instantly share code, notes, and snippets.

@rofrol

rofrol/git.log

Created January 17, 2016 19:02
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rofrol/da9fe73bed97e0043a00 to your computer and use it in GitHub Desktop.
Save rofrol/da9fe73bed97e0043a00 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git.log
$ git rebase -Xours material/master
First, rewinding head to replay your work on top of it...
fatal: Could not parse object '851623fbbbf97add64a11c1aba692f5803f06723^'
Unknown exit code (128) from command: git-merge-recursive 851623fbbbf97add64a11c1aba692f5803f06723^ -- HEAD 851623fbbbf97add64a11c1aba692f5803f06723
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment