On 2009.01.15 12:57:04 +0000, Pieter de Bie wrote: > > 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). You can handle both cases with: git add -u # Or whatever git rebase --continue Only when you split a commit, you have to explicitly reset and commit. Björn -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
