git pull --rebase would be appreciated. We should not get all our history polluted with this dumb 'merging blabla' commits.
This can be made the default for new branches: git config --global branch.autosetuprebase always LieGrue, strub ----- Original Message ----- > From: Gerhard Petracek <[email protected]> > To: [email protected] > Cc: > Sent: Tuesday, December 20, 2011 3:23 PM > Subject: git workflow > > hi @ all, > > feel free to add your suggestions to [1]. > > regards, > gerhard > > [1] > https://cwiki.apache.org/confluence/display/DeltaSpike/Suggested+Git+Workflows >
