I did a 'git log -p ..origin/xxxx' and got markers such as: '-<<<<<<< Updated upstream' and '->>>>>>> Stashed changes', what does it mean and where is it explained?
A:
git log -p will simply show the log and prints the patch between two versions.
<<<<<<<, ======== and >>>>>>>>>> are conflict markers, used to highlight textual conflicts to users when merging or applying a stash
see the man page for git-merge for examples
knittl
2010-09-28 14:38:44
I actually got some help from the #git irc-channel. I had confused things. 'git log -p' will show the diffs of every commit in the history range, while 'git diff' just shows the diff between two commits. That's why my 'git diff' didn't show those markers.
etnt
2010-09-29 06:36:22