www.digitalmars.com         C & C++   DMDScript  

digitalmars.D - The delang is using merge instead of rebase/squash

reply deadalnix <deadalnix gmail.com> writes:
This is making the history very spaghettified. Is that possible 
to have the bot rebase/squash commits and then pushing ?
Mar 15
parent reply deadalnix <deadalnix gmail.com> writes:
On Wednesday, 15 March 2017 at 13:14:31 UTC, deadalnix wrote:
 This is making the history very spaghettified. Is that possible 
 to have the bot rebase/squash commits and then pushing ?
Arf I fat fingered the title, i meant the dlang bot.
Mar 15
parent Seb <seb wilzba.ch> writes:
On Wednesday, 15 March 2017 at 13:23:00 UTC, deadalnix wrote:
 On Wednesday, 15 March 2017 at 13:14:31 UTC, deadalnix wrote:
 This is making the history very spaghettified. Is that 
 possible to have the bot rebase/squash commits and then 
 pushing ?
Arf I fat fingered the title, i meant the dlang bot.
I absolutely agree with you and in fact Andrei and I pushed for auto-merge-squash, which was enabled for the last three months. However, recently Martin disabled it to prevent "accidental squashes". Discussion: https://github.com/dlang-bots/dlang-bot/issues/64
Mar 15