On Fri, Dec 11, 2020 at 4:09 PM Theodore Y. Ts'o <tytso@xxxxxxx> wrote: > So if we think it is going to make things better going forward, I for > one am very willing to deal with any short-term pain associated with > changes here. My proposal is that eventually: git pull --no-rebase -> git pull --merge git pull --ff-only -> git pull I think that would even be easier on the fingers for you. -- Felipe Contreras
