From: Christian Couder <chriscool@tuxfamily.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH 3/4] reset: add option "--merge-dirty" to "git reset"
Date: Fri, 11 Sep 2009 07:29:32 +0200 [thread overview]
Message-ID: <200909110729.32581.chriscool@tuxfamily.org> (raw)
In-Reply-To: <alpine.LFD.2.01.0909101617280.3654@localhost.localdomain>
On Friday 11 September 2009, Linus Torvalds wrote:
> On Thu, 10 Sep 2009, Christian Couder wrote:
> > In fact with "--merge-dirty", changes that are both in
> > the work tree and the index are kept in the work tree
> > after the reset (but discarded in the index). As with
> > "--merge", changes that are in both the work tree and
> > the index are discarded after the reset.
>
> Can you explain that again?
Yeah, I tried to explain it better in my reply to Daniel.
> That paragraph makes no sense, because it
> boils down to saying two different thing for "changes that are in both
> the work tree and the index". First it says such changes are kept in the
> work tree (but discarded in the index), and then it says that the changes
> are discarded.
>
> Which seems very odd.
>
> Or are my reading comprehension skills lacking?
No, I realize it was my writing skills that were lacking again. I will
rework the commit message using some tables like in Daniel's message.
> The patch also seems to imply that it's always about HEAD. True?
Yes.
Best regards,
Christian.
next prev parent reply other threads:[~2009-09-11 5:30 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-10 20:23 [PATCH 0/4] "git reset --merge" related improvements Christian Couder
2009-09-10 20:23 ` [PATCH 1/4] reset: add a few tests for "git reset --merge" Christian Couder
2009-09-10 20:59 ` Jakub Narebski
2009-09-11 5:22 ` Christian Couder
2009-09-13 22:01 ` Tony Finch
2009-09-10 20:23 ` [PATCH 2/4] reset: use "unpack_trees()" directly instead of "git read-tree" Christian Couder
2009-09-11 5:20 ` Junio C Hamano
2009-09-11 5:34 ` Christian Couder
2009-09-11 5:55 ` Junio C Hamano
2009-09-11 6:32 ` Daniel Barkalow
2009-09-10 20:23 ` [PATCH 3/4] reset: add option "--merge-dirty" to "git reset" Christian Couder
2009-09-10 23:24 ` Linus Torvalds
2009-09-11 5:29 ` Christian Couder [this message]
2009-09-11 16:02 ` Linus Torvalds
2009-09-11 5:34 ` Junio C Hamano
2009-09-10 20:23 ` [PATCH 4/4] reset: add test cases for "--merge-dirty" option Christian Couder
2009-09-10 22:14 ` Daniel Barkalow
2009-09-11 5:05 ` Christian Couder
2009-09-11 5:36 ` Daniel Barkalow
2009-09-15 4:32 ` Christian Couder
2009-09-13 22:15 ` Paolo Bonzini
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200909110729.32581.chriscool@tuxfamily.org \
--to=chriscool@tuxfamily.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jnareb@gmail.com \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.org \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).