All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Johannes Sixt <j.sixt@viscovery.net>
Cc: Brett Randall <javabrett@gmail.com>, git@vger.kernel.org
Subject: Re: A couple of rebase --autosquash proposals
Date: Mon, 09 Dec 2013 12:20:30 -0800	[thread overview]
Message-ID: <xmqq1u1lzshd.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <52A56887.4070909@viscovery.net> (Johannes Sixt's message of "Mon, 09 Dec 2013 07:51:51 +0100")

Johannes Sixt <j.sixt@viscovery.net> writes:

> Am 12/9/2013 3:23, schrieb Brett Randall:
>> * fixup! or squash! on it's own would default to fixing-up the
>> previous commit (or result of previous step of rebase if that was a
>> squash/fixup).
>
> Why would you want that? To fixup the previous commit, just use 'git
> commit --amend'. What am I missing?

When you are not absolutely sure if the amend is a good thing to do.

Then

	work work work
        git commit --fixup HEAD
	work work work
        git commit --fixup HEAD^
	work work work
        git commit --fixup HEAD^^
	...
	git rebase --autosquash -i ...

may become a good way to polish a single commit.

  parent reply	other threads:[~2013-12-09 20:20 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09  2:23 A couple of rebase --autosquash proposals Brett Randall
2013-12-09  6:51 ` Johannes Sixt
2013-12-09  9:26   ` Chris Packham
2013-12-09  9:39     ` Philippe Vaucher
2013-12-09  9:52     ` Brett Randall
2013-12-09 20:20   ` Junio C Hamano [this message]
2013-12-09 23:20     ` Brett Randall

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=xmqq1u1lzshd.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=j.sixt@viscovery.net \
    --cc=javabrett@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.