From: Andreas Schwab <schwab@linux-m68k.org>
To: Olaf Hering <olaf@aepfle.de>
Cc: John Keeping <john@keeping.me.uk>, git@vger.kernel.org
Subject: Re: git log fails to show all changes for a file
Date: Tue, 14 Jul 2015 19:54:09 +0200 [thread overview]
Message-ID: <87615maam6.fsf@igel.home> (raw)
In-Reply-To: <20150714075955.GA24577@aepfle.de> (Olaf Hering's message of "Tue, 14 Jul 2015 09:59:55 +0200")
Olaf Hering <olaf@aepfle.de> writes:
> On Tue, Jul 14, John Keeping wrote:
>
>> It was added in an evil merge (f9da455b93f6ba076935b4ef4589f61e529ae046),
>> try:
>>
>> git log -p -M --stat --cc -- drivers/hv/channel_mgmt.c
>
> Thanks. Thats rather useless output...
Why do you think this is useless?
> @@@ -404,7 -365,7 +404,7 @@@ static u32 next_vp
> * performance critical channels (IDE, SCSI and Network) will be uniformly
> * distributed across all available CPUs.
> */
> - static void init_vp_index(struct vmbus_channel *channel, uuid_le *type_guid)
> -static u32 get_vp_index(const uuid_le *type_guid)
> ++static void init_vp_index(struct vmbus_channel *channel, const uuid_le *type_guid)
One branch renamed get_vp_index to init_vp_index, the other branch added
the const attribute. This hunk combines both changes.
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
next prev parent reply other threads:[~2015-07-14 17:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 7:30 git log fails to show all changes for a file Olaf Hering
2015-07-14 7:45 ` John Keeping
2015-07-14 7:59 ` Olaf Hering
2015-07-14 17:54 ` Andreas Schwab [this message]
2015-07-14 19:16 ` Linus Torvalds
2015-07-15 16:29 ` Junio C Hamano
2015-07-15 17:13 ` Linus Torvalds
2015-07-15 17:58 ` Junio C Hamano
2015-07-15 18:11 ` Linus Torvalds
2015-07-15 18:17 ` Junio C Hamano
2015-07-15 18:57 ` Jeff King
2015-07-15 19:22 ` Junio C Hamano
2015-07-15 19:17 ` Linus Torvalds
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=87615maam6.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=olaf@aepfle.de \
/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.