{"thread":{"id":"18808","subject":"git diff after merge (with conflict)","startedAt":"2009-04-09T17:27:43Z","lastAt":"2009-04-11T00:47:33Z","messageCount":3,"participants":["layer","Teemu Likonen","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"110934","messageId":"324.1239298063@relay.known.net","threadId":"18808","inReplyTo":null,"subject":"git diff after merge (with conflict)","fromName":"layer","fromEmail":"layer@known.net","sentAt":"2009-04-09T17:27:43Z","receivedAt":"2009-04-09T17:27:43Z","isPatch":false,"sender":{"key":"layer@known.net","avatar":null},"body":"Is there some way to get regular unified diff behavior instead of the\ncombined diff?  For certain files (like ChangeLog's) the combined diff\nformat after a merge is *very* confusing.\n\nThanks.\n\nKevin\n"},{"id":"110937","messageId":"87ljq97mjg.fsf@iki.fi","threadId":"18808","inReplyTo":"324.1239298063@relay.known.net","subject":"Re: git diff after merge (with conflict)","fromName":"Teemu Likonen","fromEmail":"tlikonen@iki.fi","sentAt":"2009-04-09T17:40:51Z","receivedAt":"2009-04-09T17:40:51Z","isPatch":false,"sender":{"key":"tlikonen@iki.fi","avatar":null},"body":"On 2009-04-09 10:27 (-0700), layer wrote:\n\n> Is there some way to get regular unified diff behavior instead of the\n> combined diff? For certain files (like ChangeLog's) the combined diff\n> format after a merge is *very* confusing.\n\nMaybe the following commands are helpful:\n\n    git diff --base\n    git diff --ours\n    git diff --theirs\n\nThose options are not documented in git-diff(1), by the way.\n"},{"id":"111032","messageId":"7vvdpcnhi2.fsf@gitster.siamese.dyndns.org","threadId":"18808","inReplyTo":"324.1239298063@relay.known.net","subject":"Re: git diff after merge (with conflict)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-11T00:47:33Z","receivedAt":"2009-04-11T00:47:33Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"layer <layer@known.net> writes:\n\n> Is there some way to get regular unified diff behavior instead of the\n> combined diff?  For certain files (like ChangeLog's) the combined diff\n> format after a merge is *very* confusing.\n\nIf you mean the resolution preview (that is you said \"after merge with\nconflict\", but what you meant was really \"during a merge with conflict, I\nhaven't recorded the final resolution with git-add yet\"), I often find\nthese two useful:\n\n\tWhat change does the other branch brought to my tree anyway?\n\t$ git diff HEAD -- that-file\n\n\tWhat did we do to the other branch?\n\t$ git diff MERGE_HEAD -- that-file\n"}]}