Justin,
Just found [1], this guy explains it better than me, except my workaround is
better than the one is got, see my example on the wiki.
-Fred
[1] http://notes.envato.com/developers/rebasing-merge-commits-in-git/
-----Message d'origine-----
From: Justin Mclean
Sent: Friday, March 22, 2013 11:36 AM
To: dev@flex.apache.org
Subject: Re: [OT] Log history
Hi,
Also anyone want to explain why this doesn't mention pull -rebase anywhere?
http://nvie.com/posts/a-successful-git-branching-model/
Also on the bug fix issue to branch or not branch (from the author of
gitflow):
"A rule of thumb would be that if you need more than one commit for a
change, you should do it on a feature branch, otherwise commit it directly
on develop."
https://github.com/nvie/gitflow/issues/24
Thanks
Justin
