Thread (5 messages) flat view 5 messages, 2 authors, 2016-06-15

Re: [PATCH] rebase -i: support single-letter abbreviations for the actions

From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:37

Hi,

On Sat, 29 Sep 2007, Avi Kivity wrote:
Johannes Schindelin wrote:
quoted
When you do many rebases, you can get annoyed by having to type out 
the actions "edit" or "squash" in total.

This commit helps that, by allowing you to enter "e" instead of 
"edit", or "s" instead of "squash", and it also plays nice with 
"merge" or "amend" as synonyms to "squash".
Can we make "amend" like squash, except that it keeps the first commit's 
authorship instead of the second?  I often merge a commit with some 
minor fix that comes later, and usually want to keep the original author 
record.
I do not necessarily think it is not doable, but I have different 
suggestion to you:

If you amend the commit with a minor fix that comes later, why not do 
"rebase -i" _before_ applying the fix, and then using "edit" on the 
respective commit?

That way you can even test the result easily, which you cannot do with 
"squash".

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