Thread (1 message) 1 message, 1 author, 2016-06-15

Re: Newbie: report of first experience with git-rebase.

From: Andreas Ericsson <hidden>
Date: 2016-06-15 22:43:46

Steven Grimm wrote:
Junio C Hamano wrote:
quoted
Andreas Ericsson [off-list ref] writes:
 
quoted
Make "git rebase --skip" skip patches regardless of tree and index 
state,
but still refuse to *start* with dirty tree or index. That way, there's
no risk of losing anything that can't be re-created unless the user asks
for it.
    
Sounds like a plan.
  
I'm unclear how that helps the usability issue here at all, though it 
doesn't sound like an unreasonable change on its own merit.
Because 'git commit --skip' will not require the user to first edit the
tree so the index matches the upstream thing, and he doesn't have to
manually run 'git reset --hard' before --skip'ing.

It's a small improvement, but one that goes in the right direction.

Btw, the above sentence should've read "but still refuse to *start*
(as in, start a brand new rebase) with dirty tree or index"

-- 
Andreas Ericsson                   andreas.ericsson@op5.se
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help