All of lore.kernel.org
 help / color / mirror / Atom feed
From: layer <layer@known.net>
To: git@vger.kernel.org
Subject: git diff after merge (with conflict)
Date: Thu, 09 Apr 2009 10:27:43 -0700	[thread overview]
Message-ID: <324.1239298063@relay.known.net> (raw)

Is there some way to get regular unified diff behavior instead of the
combined diff?  For certain files (like ChangeLog's) the combined diff
format after a merge is *very* confusing.

Thanks.

Kevin

             reply	other threads:[~2009-04-09 17:29 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-04-09 17:27 layer [this message]
2009-04-09 17:40 ` git diff after merge (with conflict) Teemu Likonen
2009-04-11  0:47 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=324.1239298063@relay.known.net \
    --to=layer@known.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.