From: Linus Torvalds <torvalds@linux-foundation.org>
To: Christian Couder <chriscool@tuxfamily.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>,
Paolo Bonzini <bonzini@gnu.org>,
Johannes Sixt <j.sixt@viscovery.net>,
Stephen Boyd <bebarino@gmail.com>
Subject: Re: [PATCH v6 0/4] "git reset --merge" related improvements
Date: Thu, 31 Dec 2009 16:25:33 -0800 (PST) [thread overview]
Message-ID: <alpine.LFD.2.00.0912311623210.3630@localhost.localdomain> (raw)
In-Reply-To: <20091230055008.4475.95755.chriscool@tuxfamily.org>
On Wed, 30 Dec 2009, Christian Couder wrote:
>
> Another reroll with the following changes:
> - patches to add --keep option have been removed for now
> - documentation patch has been moved before the core code changes
> - commit messages have been improved
> - tests have been much improved thanks to Junio's suggestions
>
> Christian Couder (3):
> reset: improve mixed reset error message when in a bare repo
> Documentation: reset: add some tables to describe the different
> options
> reset: add a few tests for "git reset --merge"
>
> Stephan Beyer (1):
> reset: use "unpack_trees()" directly instead of "git read-tree"
FWIW, Ack on this version of the whole series - I don't think there is
anything controversial here, and I think avoiding the execve of read-tree
for something we have a library function for is a good thing (and the
change in behavior looks like a bug-fix to me).
And the whole "--keep" discussion can be resurrected later ;)
Linus
next prev parent reply other threads:[~2010-01-01 0:26 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-30 5:54 [PATCH v6 0/4] "git reset --merge" related improvements Christian Couder
2009-12-30 5:54 ` [PATCH v6 1/4] reset: improve mixed reset error message when in a bare repo Christian Couder
2009-12-30 5:54 ` [PATCH v6 2/4] Documentation: reset: add some tables to describe the different options Christian Couder
2010-01-01 5:15 ` Junio C Hamano
2010-01-02 5:52 ` Christian Couder
2009-12-30 5:54 ` [PATCH v6 3/4] reset: add a few tests for "git reset --merge" Christian Couder
2010-01-01 5:15 ` Junio C Hamano
2010-01-02 5:58 ` Christian Couder
2009-12-30 5:54 ` [PATCH v6 4/4] reset: use "unpack_trees()" directly instead of "git read-tree" Christian Couder
2010-01-01 5:14 ` Junio C Hamano
2010-01-01 7:03 ` Junio C Hamano
2010-01-02 5:41 ` Christian Couder
2010-01-01 0:25 ` Linus Torvalds [this message]
2010-01-01 20:42 ` [PATCH v6 0/4] "git reset --merge" related improvements Junio C Hamano
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=alpine.LFD.2.00.0912311623210.3630@localhost.localdomain \
--to=torvalds@linux-foundation.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=bebarino@gmail.com \
--cc=bonzini@gnu.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jnareb@gmail.com \
--cc=s-beyer@gmx.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