It was only about
git pull --rebase Which means that _your_ _own_ commits done in the meantime (and not pushed upwards) will get rebased to the tip of HEAD. If you don't do this, you will always get this ugly 'auto-merge with master' commits. This is something we should not do, because it doesn't reflect the reality. In all other situations, a rebase where some commits got pushed upwards already is forbidden anyway! LieGrue, strub ----- Original Message ----- > From: Jason Porter <[email protected]> > To: "[email protected]" > <[email protected]> > Cc: "[email protected]" > <[email protected]> > Sent: Tuesday, December 20, 2011 8:58 PM > Subject: Re: git workflow > > Preference here, but -1 for rebase merging. I personally like seeing where > everything came from. > > I get scared when I see people suggesting rebase all the time, not because > I'm afraid of rebase, but for people new(er) to git, rebase is confusing and > often leads to problems. > > If we want to rebase and fast-forward merge everything to the main repo, > which > is controlled by the main development team I'm okay with that. I just > don't want to tell new contributors they need to understand rebase or have > them come into irc or the mailing list saying their repo is fubar. > > Sent from my iPhone > > On Dec 20, 2011, at 7:35, Mark Struberg <[email protected]> wrote: > >> 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 >>> >
