From: Johannes Sixt <j.sixt@viscovery.net>
To: Git Mailing List <git@vger.kernel.org>
Subject: combined diff, but not condensed, howto?
Date: Wed, 17 Sep 2008 10:00:07 +0200 [thread overview]
Message-ID: <48D0B907.7040903@viscovery.net> (raw)
After a merge conflict, 'git diff' shows a combined diff, which presents
only the parts that conflicted or where there are near-by changes from
different parents (potential conflicts). Is there a command line switch so
that *all* changes are shown, even non-conflicting ones?
'git diff', 'git diff --cc', and 'git diff -c' all show the same output.
-- Hannes
next reply other threads:[~2008-09-17 8:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-17 8:00 Johannes Sixt [this message]
2008-09-17 16:58 ` combined diff, but not condensed, howto? Junio C Hamano
2008-09-18 5:57 ` Johannes Sixt
2008-09-18 6:14 ` Junio C Hamano
2008-09-18 6:24 ` Johannes Sixt
2008-09-18 7:01 ` Junio C Hamano
2008-09-18 7:30 ` Johannes Sixt
2008-09-18 9:08 ` [PATCH] diff/diff-files: do not use --cc too aggressively Junio C Hamano
2008-09-18 9:30 ` Johannes Sixt
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=48D0B907.7040903@viscovery.net \
--to=j.sixt@viscovery.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.