From: Christian Couder <chriscool@tuxfamily.org>
To: Daniel Barkalow <barkalow@iabervon.org>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Jakub Narebski <jnareb@gmail.com>
Subject: Re: [PATCH 2/3] sequencer: add "--reset-hard" option to "git sequencer--helper"
Date: Tue, 4 Aug 2009 23:17:26 +0200 [thread overview]
Message-ID: <200908042317.26408.chriscool@tuxfamily.org> (raw)
In-Reply-To: <alpine.LNX.2.00.0908041111550.2147@iabervon.org>
On Tuesday 04 August 2009, Daniel Barkalow wrote:
> On Mon, 3 Aug 2009, Christian Couder wrote:
> > This new option uses the "reset_almost_hard()" function to perform
> > a reset.
>
> Shouldn't it make it possible to do an almost-hard reset (that is, keep a
> dirty working tree's changes while changing the index and HEAD to a
> different commit)?
Yeah, I will improve the documentation of this function as Junio requested.
> AFAICT, this series doesn't expose the interesting new
> functionality it provides.
>
> Also, I thought that we'd found that other built-ins could be simplified
> through the use of functions you're adding here. In particular, checkout
> wants to change the index and working tree while preserving dirty working
> tree changes. So it would probably be better for it to go in a library
> object, where sequencer--helper would just make it available to shell
> code.
Yeah, I agree, but right now I'd rather keep the code quite close to what it
is on the sequencer repo if possible.
Thanks,
Christian.
next prev parent reply other threads:[~2009-08-04 21:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-03 2:40 [PATCH 2/3] sequencer: add "--reset-hard" option to "git sequencer--helper" Christian Couder
2009-08-04 15:34 ` Daniel Barkalow
2009-08-04 21:17 ` Christian Couder [this message]
2009-08-04 23:09 ` Daniel Barkalow
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=200908042317.26408.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 \
/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).