Re: Linear git history

2020-08-03 Thread Stefano Zacchiroli
On Mon, Aug 03, 2020 at 09:41:03AM +0800, Martin Michlmayr wrote: > > Looking around in the web interface, it seems that it is not > > possible to change the default method used > > I *believe* it remembers the type of the last merge you did and offers > that as the default. That's also my (unsci

Re: Linear git history

2020-08-02 Thread Martin Blais
I'm indifferent (I use log --graph so it's always clear enough to me). I can rebase in the future if you prefer. On Sun, Aug 2, 2020 at 9:41 PM Martin Michlmayr wrote: > * Daniele Nicolodi [2020-08-02 16:16]: > > I don't have much experience with Github managed projects, but it seems > > that

Re: Linear git history

2020-08-02 Thread Martin Michlmayr
* Daniele Nicolodi [2020-08-02 16:16]: > I don't have much experience with Github managed projects, but it seems > that the default action to incorporate PRs into the master branch is to > do merges. I really dislike that and always wonder why it's the default on GitHub. > I think the "Rebase an

Linear git history

2020-08-02 Thread Daniele Nicolodi
Hello, I think that striving to have linear history rather than (sometimes crossed) merges is a worthwhile goal to keep the repository and history more tidy. The git branching model is something that I never been to fond of. I don't have much experience with Github managed projects, but it seems