From: Piotr Krukowiecki Date: Tue, 22 Mar 2011 08:04:34 GMT Subject: Re: cherry-pick applies some other changes than the specified one? Message-ID: In-Reply-To: <4D879516.3060204@gmail.com> On Mon, Mar 21, 2011 at 7:12 PM, Piotr Krukowiecki wrote: > W dniu 21.03.2011 17:41, Johannes Sixt pisze: >> Assuming you did not 'git add' the file yet, you are looking at the >> "condensed combined diff" after manually resolving the conflict by doing >> the "+line" manually that the cherry-pick should have brought in. Of >> course, a lot of context is visible here if both sides have diverged >> considerably in this area. >> >> I.e. the diff will look something like >> >>  +line from HEAD >>  +line from HEAD >> + line from cherry-picked >>  +line from HEAD >> ... >> >> Notice the double columns before the content lines. This sort of diff >> extens above and below the conflicting section until there is a "gap" of 3 >> lines that changed neither on the HEAD side nor on the cherry-picked side >> since the merge base. > > Hm that might be possible! I'll check it tomorrow @work. You were right - the line I've added manually have two "++", and the other lines shown with differences only have "-" and "+" in the second column. I'm still not clear what is exactly compared when I use plain diff or -c version. It might be I need to read more docs. I'll ask if I'm still in doubt after reading more. Thanks again for explaining this to me - saved me from a lot of PITA researching :) -- Piotr Krukowiecki