From: Adam Monsen <haircut@gmail.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: frustrated forensics: hard to find diff that undid a fix
Date: Sat, 05 Mar 2011 06:34:55 -0800 [thread overview]
Message-ID: <4D724A0F.7050904@gmail.com> (raw)
In-Reply-To: <m37hcd7qfv.fsf@localhost.localdomain>
Jakub Narebski wrote:
> By default "git log -p" and "git show" considers merges uninteresting.
> Try "git log -p -c" or "git log -p -m".
Holy cow, that's a lifesaver! Thank you, Jakub!!
I totally missed the whole "Diff Formatting" section in the git-log(1)
manpage.
"git log -p -c" does exactly what I want. I'll make an alias or
something for these options.
I'm confused by this section of git-log(1):
COMBINED DIFF FORMAT
"git-diff-tree", "git-diff-files" and "git-diff" can take -c
or --cc option to produce combined diff. For showing a merge
commit with "git log -p", this is the default format; you can
force showing full diff with the -m option.
Sounds like this is saying that -c is the default with "git log -p".
I'll submit a patch to fix that.
next prev parent reply other threads:[~2011-03-05 14:35 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-05 6:20 frustrated forensics: hard to find diff that undid a fix Adam Monsen
2011-03-05 10:00 ` Jonathan del Strother
2011-03-05 11:33 ` Jakub Narebski
2011-03-05 12:51 ` Jonathan Nieder
2011-03-05 13:48 ` Jeff King
2011-03-05 14:34 ` Adam Monsen [this message]
2011-03-05 19:56 ` [PATCH 0/2] improve combined diff documentation Adam Monsen
2011-03-05 19:56 ` [PATCH 1/2] documentation fix: git log -p does not imply -c Adam Monsen
2011-03-07 0:36 ` Junio C Hamano
2011-03-07 15:47 ` Jeff King
2011-03-07 18:37 ` Junio C Hamano
2011-03-07 19:12 ` Jeff King
2011-03-07 21:57 ` [PATCH v3] Documentation " Adam Monsen
2011-03-08 0:21 ` Junio C Hamano
2011-03-08 0:49 ` [PATCH v4] " Adam Monsen
2011-03-08 19:43 ` Junio C Hamano
2011-03-08 20:46 ` Adam Monsen
2011-03-09 0:58 ` Junio C Hamano
2011-03-09 21:25 ` Adam Monsen
2011-03-09 21:27 ` [PATCH] SubmittingPatches: clean up commit message tips Adam Monsen
2011-03-09 22:20 ` Junio C Hamano
2011-03-08 20:51 ` [PATCH v5] diff format documentation: clarify --cc and -c Adam Monsen
2011-03-08 21:03 ` [PATCH v6] " Adam Monsen
2011-03-08 1:19 ` [PATCH v3] Documentation fix: git log -p does not imply -c Jeff King
2011-03-05 19:56 ` [PATCH 2/2] English grammar fixes for combined diff doc Adam Monsen
2011-03-05 14:29 ` frustrated forensics: hard to find diff that undid a fix Martin von Zweigbergk
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=4D724A0F.7050904@gmail.com \
--to=haircut@gmail.com \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
/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.