On 03/04/2014 11:24 AM, Duy Nguyen wrote:
> On Tue, Mar 4, 2014 at 3:59 PM, Michael Haggerty <mhagger@xxxxxxxxxxxx> wrote:
>> git rebase --fixup COMMIT
>> git rebase --squash COMMIT
>
> This is not interactive (except when merge conflicts occur), is it?
--fixup would not be interactive (is that a problem?), but --squash does
open an editor to allow you to merge the commit messages.
> A bit off topic. I sometimes want to fix up a commit and make it stop
> there for me to test it again but there is no such command, is there?
> Maybe we could add support for "fixup/edit" (or "fe" for short) and
> "squash/edit" ("se"). Not really familiar with the code base to do
> that myself quickly though.
Maybe we should allow "edit" to appear on a line by itself, without a
SHA-1, in which case it would stop after all previous lines had been
processed. Then you could change one line to "fixup" or "squash", and
then add a blank "edit" line after it. Though there is no really
obvious way to do this using the hypothetical new command line options
that we have been discussing.
Michael
--
Michael Haggerty
mhagger@xxxxxxxxxxxx
http://softwareswirl.blogspot.com/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html