From: "Carlos Martín Nieto" <cmn@elego.de>
To: git@vger.kernel.org
Subject: rebase autosquash doesn't recognise a chain of fixups
Date: Tue, 5 Apr 2011 17:41:00 +0200 [thread overview]
Message-ID: <20110405154100.GC16031@bee.lab.cmartin.tk> (raw)
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`. When I want to
squash them all into 0869d30, I do `git rebase -i --autosquash
0869d30^` and I get
pick 0869d30 one
fixup 0d130d8 fixup! one
pick 5154127 fixup! fixup! one
when I was hoping for
pick 0869d30 one
fixup 0d130d8 fixup! one
fixup 5154127 fixup! fixup! one
Changing the options to the latter one works (as in, the patches
apply). Is this expected? Am I just too lazy and should look up the
commit I want to fixup?
cmn
next reply other threads:[~2011-04-05 15:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 15:41 Carlos Martín Nieto [this message]
2011-04-05 15:48 ` rebase autosquash doesn't recognise a chain of fixups Vincent van Ravesteijn
2011-04-05 16:03 ` Carlos Martín Nieto
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=20110405154100.GC16031@bee.lab.cmartin.tk \
--to=cmn@elego.de \
--cc=git@vger.kernel.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 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).