From: Ralph Maalouf <ralph.maalouf@caretrx.com>
Date: Mon, 29 Jul 2019 22:26:39 GMT
Subject: RE: 'git show -c' omits hunk even though file was modified from all parents
Message-ID: <MN2PR13MB2607F98BF473C36A0C8F17ECEADD0@MN2PR13MB2607.namprd13.prod.outlook.com>
In-Reply-To: <xmqqsgqotsyi.fsf@gitster-ct.c.googlers.com>

Ahh that clears it up for me. I incorrectly assumed that at minimum that each "<<<<<<HEAD" represented a hunk..

I searched for the definition of hunk in gitglossary but couldn't find it.

Thanks for the clarification!
Ralph

-----Original Message-----
From: Junio C Hamano <gitster@pobox.com> 
Sent: Monday, July 29, 2019 5:46 PM
To: Ralph Maalouf <ralph.maalouf@caretrx.com>
Cc: 'git@vger.kernel.org' <git@vger.kernel.org>
Subject: Re: 'git show -c' omits hunk even though file was modified from all parents

Ralph Maalouf <ralph.maalouf@caretrx.com> writes:

> "We do not show hunks that match one of the parents ". But in case
> 1 the second hunk matches one of the parents yet `git show -c` still 
> outputs it.
>
> diff --combined test1
> index 02ef2b0,ffc05f2..59d575d
> --- a/test1
> +++ b/test1
> @@@ -1,8 -1,8 +1,9 @@@
>   One
>  +Two
> + Four
>   Three
>
>
>   Seven
>  -Ten
>  +Eight
>   Nine

The above is a single hunk (whose definition is the group of lines delimited by @@@...@@@ lines).