From: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: cherry-pick applies some other changes than the specified one?
Date: Mon, 21 Mar 2011 21:06:10 +0100 [thread overview]
Message-ID: <4D87AFB2.8080904@gmail.com> (raw)
In-Reply-To: <7vei60p86y.fsf@alter.siamese.dyndns.org>
W dniu 21.03.2011 20:47, Junio C Hamano pisze:
> Piotr Krukowiecki <piotr.krukowiecki@gmail.com> writes:
>
>> I think I even suspected this might have something to do with the merge
>> conflict and tried to make git-diff show me exact change between working
>> tree and index/HEAD (ignoring the merge).
>
> Doesn't "git diff HEAD" show the difference between HEAD and working tree
> without the higher stages for the path getting in the way?
Forgot about this - usually commit defaults to HEAD if you didn't specify it.
My fault.
> The difference between the index and the working tree is "git diff" which
> is condensed. I think you can force it to uncondense it by giving "-c"
> option, but I haven't tried (didn't find a need/use for it for a long
> time).
I think I tried it and it didn't work. It's also not described in git diff
man page.
--
Piotr Krukowiecki
next prev parent reply other threads:[~2011-03-21 20:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-21 9:27 cherry-pick applies some other changes than the specified one? Piotr Krukowiecki
2011-03-21 16:09 ` Junio C Hamano
2011-03-21 16:41 ` Johannes Sixt
2011-03-21 18:12 ` Piotr Krukowiecki
2011-03-21 19:47 ` Junio C Hamano
2011-03-21 20:06 ` Piotr Krukowiecki [this message]
2011-03-21 19:58 ` Jonathan Nieder
2011-03-21 20:07 ` Piotr Krukowiecki
2011-03-21 20:21 ` Junio C Hamano
2011-03-21 20:54 ` Junio C Hamano
2011-03-22 5:27 ` Jonathan Nieder
2011-03-22 6:37 ` Junio C Hamano
2011-03-22 8:04 ` Piotr Krukowiecki
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=4D87AFB2.8080904@gmail.com \
--to=piotr.krukowiecki@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).