On Fri, Jul 8, 2011 at 2:10 PM, Benjamin Muskalla
<benjamin.muskalla@xxxxxxxxxxx> wrote:
+1 for always rebase.
branch.autosetuprebase
=> git config branch.autosetuprebase always
Another resource for CVS committers is the "Git workflows for CVS users" from the Platform team:
We should just get rid of the paragraph "Cross-referencing between bugzilla and git" ;)
Benny
On Fri, Jul 8, 2011 at 1:44 PM, Steffen Pingel
<steffen.pingel@xxxxxxxxxxx> wrote:
Git has significant benefits buts also adds complexity. There are a few things to keep in mind when committing and pushing to Git such as to never rebase a pushed branch. We had a discussion around Git best practices on the Mylyn Reviews mailing list a while ago that I have been meaning to capture in the contributors reference:
http://dev.eclipse.org/mhonarc/lists/mylyn-reviews-dev/msg00339.html
The main outcome of the discussion was a strong recommendation to run "git pull --rebase" before pushing to keep the history as flat as possible and hence simple to trace. I would recommend that we follow the same practice for all other Mylyn sub-projects as well.
Steffen