Hi all, I am resurrecting this old thread since I have recently seen some merge commits in our commit history:
https://git-wip-us.apache.org/repos/asf?p=syncope.git;a=shortlog Please configure your GIT client to work properly, as suggested below. I have also updated our GIT reference at https://cwiki.apache.org/confluence/display/SYNCOPE/Git+workflow Regards. On 2015-10-20 15:17 (+0200), Francesco Chicchiriccò <ilgro...@apache.org> wrote: > On 20/10/2015 15:14, Massimiliano Perrone wrote: > > Hi Syncopers, > > maybe this mail could be useful at all. > > > > Few minutes ago Francesco committed just few seconds before my commit. > > In this way I got a merge commit. The latter means an empty commit in > > our "commits history". > > > > To prevent this situation Francesco suggested me to config the Git > > repository running "git config branch.master.rebase true" from Syncope > > base directory. In this way the repository is configured to have an > > automatic rebase running the git pull command. > > The "avoid merge commits" hype is quite high out there, and even common > in several ASF projects, with main benefit IMO of producing cleaner > commit history. > > With the config setting reported above, any > > git pull > > will be transparently handled by GIT as if it was > > git pull --rebase > > see [1] for more details. > > Regards. > > [1] > http://randyfay.com/content/simpler-rebasing-avoiding-unintentional-merge-commits >
