syncope-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Massimiliano Perrone <massimiliano.perr...@tirasa.net>
Subject Prevent "merge commit"
Date Tue, 20 Oct 2015 13:14:03 GMT
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.

Massi

-- 
Massimiliano Perrone
Tel +39 393 9121310

Tirasa S.r.l.
Viale D'Annunzio 267 - 65127 Pescara
Tel +39 0859116307 / FAX +39 0859111173
http://www.tirasa.net

"L'apprendere molte cose non insegna l'intelligenza"
(Eraclito)


Mime
View raw message