git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Rast <trast@student.ethz.ch>
To: Clemens Buchacher <drizzd@aon.at>
Cc: <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] rebase --fix: interactive fixup mode
Date: Mon, 9 Jan 2012 10:13:33 +0100	[thread overview]
Message-ID: <878vlh1bnm.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <20120108213134.GA18671@ecki.lan> (Clemens Buchacher's message of "Sun, 8 Jan 2012 22:31:34 +0100")

Clemens Buchacher <drizzd@aon.at> writes:

> Interactive rebase is frequently used not to rebase history, but to
> manipulate recent commits. This is typically done using the following
> command:
>
>  git rebase -i HEAD~N
>
> Where N has to be large enough such that the the range HEAD~N..HEAD
> contains the desired commits. At the same time, it should be small
> enough such that the range HEAD~N..HEAD does not include published
> commits or a merge commit.
[...]
>  git rebase --fix
>
> By default, the range is limited to a maximum of 20 commits.

Given the name I would expect --fix to rebase far enough to make recent
fixup!/squash! commits take effect.  Perhaps name it --recent?

(And I also think that the 20 is rather arbitrary...)

-- 
Thomas Rast
trast@{inf,student}.ethz.ch

  parent reply	other threads:[~2012-01-09  9:13 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-08 21:31 [PATCH] rebase --fix: interactive fixup mode Clemens Buchacher
2012-01-08 21:57 ` Jakub Narebski
2012-01-08 22:19   ` Clemens Buchacher
2012-01-08 22:01 ` Jonathan Nieder
2012-01-08 22:25   ` Clemens Buchacher
2012-01-09  1:44   ` Nguyen Thai Ngoc Duy
2012-01-09  8:43     ` Jonathan Nieder
2012-01-08 22:58 ` Junio C Hamano
2012-01-09 20:33   ` Clemens Buchacher
2012-01-09  8:40 ` Michael Haggerty
2012-01-10 19:58   ` Neal Kreitzinger
2012-01-09  9:13 ` Thomas Rast [this message]
2012-01-09 20:16   ` Clemens Buchacher

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=878vlh1bnm.fsf@thomas.inf.ethz.ch \
    --to=trast@student.ethz.ch \
    --cc=drizzd@aon.at \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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).