Re: Hey - A Conceptual Simplication....
- From
Dmitry Potapov <dpotapov@gmail.com>
- Date
- Nov 20, 2009, 02:56 UTC
- Message-ID
- <20091120025617.GD22556@dpotapov.dyndns.org>
- In-Reply-To
- <alpine.DEB.2.00.0911191754540.10307@asgard.lang.hm>
On Thu, Nov 19, 2009 at 05:55:21PM -0800, david@lang.hm wrote:
Show 9 quoted lines
> On Fri, 20 Nov 2009, Dmitry Potapov wrote: > >> So, the correct way to use Git is to find the right balance between >> the need to clean up after mistakes (using git-rebase) and not doing >> too much, so you will not lose important history or create problems >> for other peoples. > > the typical advice is to clean up before you make changes public, but not > afterwords.
True, except patches may get additional clean up or improvements based on review feedback, or even get some small fix-ups while they live on 'pu'. But re-writing something that other people may base their work on is clearly wrong. On the other hand, rebasing a large series of patches even if it has never been published may be a wrong way to go, because you replace well tested states with some others, which were not tested. So if it is a long and complex series of patches, chances are high that you can break something in it. So, it requires some judgement when to use git-rebase and when git-merge.
Dmitry