On 02/19/2012 04:58 PM, Stephen Kelly wrote:
Stephen Kelly wrote:
Hi there,
I was reviewing the changes in the frameworks branch from yesterday.
Something I noticed was that there are a lot of merge commits that don't
need to exist.
Ugh. Yet more of this just appeared... Recent history in the frameworks
branch looks far more complex than it is and is harder to follow.
There are too many people unaware that they're doing it maybe...
Yeah I notice I did it :( It happened yesterday because we were new
people (which was very good) working on frameworks and not all of us are
100% used to git yet.
I did
git config branch.autosetuprebase always
which should always rebase.
I guess I should get used to using gitk.
Anne-Marie
