All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andreas Ericsson <ae@op5.se>
To: Steven Grimm <koreth@midwinter.com>
Cc: Junio C Hamano <gitster@pobox.com>,
	"J. Bruce Fields" <bfields@fieldses.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Sergei Organov <osv@javad.com>,
	git@vger.kernel.org
Subject: Re: Newbie: report of first experience with git-rebase.
Date: Fri, 02 Nov 2007 20:22:18 +0100	[thread overview]
Message-ID: <472B78EA.6050502@op5.se> (raw)
In-Reply-To: <472B77AC.5080507@midwinter.com>

Steven Grimm wrote:
> Junio C Hamano wrote:
>> Andreas Ericsson <ae@op5.se> writes:
>>  
>>> 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

  parent reply	other threads:[~2007-11-02 19:38 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-31 19:39 Newbie: report of first experience with git-rebase Sergei Organov
2007-10-31 19:57 ` Björn Steinbrink
2007-10-31 20:28   ` Sergei Organov
2007-10-31 21:12     ` Johannes Schindelin
2007-10-31 21:29       ` J. Bruce Fields
2007-10-31 22:06         ` Steven Grimm
2007-10-31 22:35           ` Daniel Barkalow
2007-10-31 22:38           ` J. Bruce Fields
2007-10-31 21:39       ` Junio C Hamano
2007-10-31 22:53         ` David Kastrup
2007-11-01  2:27         ` Nicolas Pitre
2007-11-01 12:13         ` Sergei Organov
2007-11-01 14:24           ` Johannes Schindelin
2007-11-01 15:10             ` J. Bruce Fields
2007-11-01 20:20               ` Junio C Hamano
2007-11-02 10:13                 ` Andreas Ericsson
2007-11-02 19:11                   ` Junio C Hamano
     [not found]                     ` <472B77AC.5080507@midwinter.com>
2007-11-02 19:22                       ` Andreas Ericsson [this message]
2007-10-31 22:49       ` David Kastrup
2007-10-31 21:25 ` Alex Riesen

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=472B78EA.6050502@op5.se \
    --to=ae@op5.se \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=bfields@fieldses.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=koreth@midwinter.com \
    --cc=osv@javad.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.