Re: [PATCH] rebase --fix: interactive fixup mode

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] rebase --fix: interactive fixup mode

From: Thomas Rast <hidden>
Date: 2016-06-15 22:52:45

Clemens Buchacher [off-list ref] 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

Re: [PATCH] rebase --fix: interactive fixup mode

From: Clemens Buchacher <hidden>
Date: 2016-06-15 22:52:45

On Mon, Jan 09, 2012 at 10:13:33AM +0100, Thomas Rast wrote:
Given the name I would expect --fix to rebase far enough to make recent
fixup!/squash! commits take effect.  Perhaps name it --recent?
Sure, I am not particular about the name.
(And I also think that the 20 is rather arbitrary...)
Well, I need some kind of limit. Otherwise we will list the entire
history up to the root commit in case of repos with only linear history.
And that can be rather slow.

Clemens
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help