From: Jonathan Nieder <jrnieder@gmail.com>
To: Piotr Krukowiecki <piotr.krukowiecki@gmail.com>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: cherry-pick applies some other changes than the specified one?
Date: Mon, 21 Mar 2011 14:58:46 -0500 [thread overview]
Message-ID: <20110321195846.GA4277@elie> (raw)
In-Reply-To: <4D879516.3060204@gmail.com>
Piotr Krukowiecki wrote:
> 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), so I can verify the file indeed
> only have the change I did, but I could not find such option.
> Does it exists?
Sure. The index contains multiple competing versions, which you can
see with "git ls-files -u". To compare the working tree and one of
those use "git diff --base / --ours / --theirs" (or -1 / -2 / -3).
To view changes relative to a particular commit, use "git diff <commit>".
For example, "git diff HEAD". The git-diff(1) manpage (shown by
"git diff --help") explains.
Hope that helps,
Jonathan
next prev parent reply other threads:[~2011-03-21 19:59 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
2011-03-21 19:58 ` Jonathan Nieder [this message]
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=20110321195846.GA4277@elie \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=piotr.krukowiecki@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 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).