All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Carlos Martín Nieto" <carlos@cmartin.tk>
To: Vincent van Ravesteijn <vfr@lyx.org>
Cc: "Carlos Martín Nieto" <cmn@elego.de>, git@vger.kernel.org
Subject: Re: rebase autosquash doesn't recognise a chain of fixups
Date: Tue, 5 Apr 2011 18:03:36 +0200	[thread overview]
Message-ID: <20110405160336.GA20336@bee.lab.cmartin.tk> (raw)
In-Reply-To: <4D9B39EB.9040208@lyx.org>

On Tue, Apr 05, 2011 at 05:48:59PM +0200, Vincent van Ravesteijn wrote:
> On 5-4-2011 17:41, Carlos Martín Nieto wrote:
> >Hello,
> >
> >  Say I have the following commits:
> >
> >     5154127 fixup! fixup! one
> >     0d130d8 fixup! one
> >     0869d30 one
> >
> >because I keep executing `git commit -a --fixup HEAD`.
> >
> >Am I just too lazy and should look up the commit I want to fixup?
> 
> I would use 'git commit --amend -a' instead if I am already sure
> that I want to squash my commit into the previous one.

 That does make more sense. I guess I was just too excited about
 discovering fixups :)

   cmn

  reply	other threads:[~2011-04-05 16:03 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-05 15:41 rebase autosquash doesn't recognise a chain of fixups Carlos Martín Nieto
2011-04-05 15:48 ` Vincent van Ravesteijn
2011-04-05 16:03   ` Carlos Martín Nieto [this message]
2011-04-05 17:34 ` Junio C Hamano
2011-04-05 18:02   ` Kevin Ballard
2011-04-05 18:27     ` Junio C Hamano
     [not found]       ` <BANLkTimqvu7c559_AQ6yLxPACOxD0ciNxQ@mail.gmail.com>
2011-04-05 21:03         ` 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=20110405160336.GA20336@bee.lab.cmartin.tk \
    --to=carlos@cmartin.tk \
    --cc=cmn@elego.de \
    --cc=git@vger.kernel.org \
    --cc=vfr@lyx.org \
    /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.