[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: git bikeshedding (Re: triggers in dpkg, and dpkg maintenance)

On Tue, 26 Feb 2008, Ian Jackson wrote:
> But, is it really worth the effort to go back and edit revision logs
> now ?  And if I do so, will I disrupt merging any less than if I
> rebase ?

As soon as you edit commits, they'll get a new id, and thus you'll disrupt

The thing that you doesn't seem to understand is that if you don't do it,
Guillem will do it for you and you'll have to fix up your other branches
(flex-based parser, ...) anyway and you won't be able to use plain merge
for that (or rather you can but it will be highly inefficient compared to
a "git-rebase -i" where you skip the irrelevant commits that have been
merged with other id). 

Raphaël Hertzog

Le best-seller français mis à jour pour Debian Etch :

Reply to: