From: Sverre Rabbelier <srabbelier@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Ping Yin <pkufranky@gmail.com>, git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] git-add: introduce --edit (to edit the diff vs. the index)
Date: Mon, 13 Apr 2009 18:59:43 +0200 [thread overview]
Message-ID: <fabb9a1e0904130959y20ff66a8la426f33dc0a9bf8b@mail.gmail.com> (raw)
In-Reply-To: <alpine.DEB.1.00.0904131817160.10279@pacific.mpi-cbg.de>
Heya,
On Mon, Apr 13, 2009 at 18:19, Johannes Schindelin
<Johannes.Schindelin@gmx.de> > Would not a much saner way be
>
> $ git reset HEAD^
> $ git add -p
> $ git stash save --keep-index
> # test it
> $ git commit
> $ git stash apply
> # test again
> $ git commit
That's what I do already, but now imagine that at the # test it step I
notice that I staged too much, or need to tweak some value only in
this commit (e.g., change test_expect_success to test_expect_failure
because this commit is the test that indicates the failure, and the
next one will fix it and flip from expect_failure to expect_success).
At the moment I have to make the change in my working directory (which
potentially involved deleting a lot of hunks), stage that and _then_
make my commit. With 'git add -e' I can make the fix and happily
continue.
--
Cheers,
Sverre Rabbelier
next prev parent reply other threads:[~2009-04-13 17:01 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1239225986u.git.johannes.schindelin@gmx.de>
2009-04-08 21:30 ` [PATCH] git-add: introduce --edit (to edit the diff vs. the index) Johannes Schindelin
2009-04-08 21:32 ` Sverre Rabbelier
2009-04-09 2:00 ` Ping Yin
2009-04-10 1:43 ` Ping Yin
2009-04-10 2:03 ` Ping Yin
2009-04-10 18:10 ` Johannes Schindelin
2009-04-10 18:59 ` Sverre Rabbelier
2009-04-13 16:19 ` Johannes Schindelin
2009-04-13 16:59 ` Sverre Rabbelier [this message]
2009-04-11 1:11 ` Ping Yin
2009-04-13 16:21 ` Johannes Schindelin
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=fabb9a1e0904130959y20ff66a8la426f33dc0a9bf8b@mail.gmail.com \
--to=srabbelier@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pkufranky@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).