[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    Re: [RFC PATCH] Make the rebase edit mode really end up in an edit state
From:       Pieter de Bie <pieter () frim ! nl>
Date:       2009-01-15 12:57:04
Message-ID: 8B5B7148-B900-4E01-9B2C-16C251966F7F () frim ! nl
[Download RAW message or body]


On Jan 15, 2009, at 12:36 PM, Johannes Schindelin wrote:

> BTW I was not fully happy with 'edit' back then, either, which is the
> reason why I showed the usage in the comment _above_ the commit  
> list.  But
> nobody could suggest a name that I found convincingly better.

(BTW, I reply to this thread because I'm also often confused with the
rebase. The thing that hits me most is that with resolving conflicts,
you have to do a 'git commit' and with 'edit', you have to do a 'git
commit --amend'. This can get confusing if you set up an interactive
rebase where you have some new picks or squashes, and also an edit.
If the rebase stops, you first have to carefully read whether you're
supposed to do a 'git commit' or a 'git commit --amend', and remember
that until you're finished with the changes).

- Pieter
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]