Re: automatically preventing merge commits on master

2009-03-07 Thread Jim Meyering
Bruno Haible wrote: > Oops, I did it again. This time, I have a history of what I did, and I'm sure > I worked in a single gnulib checkout: > > - Did a "git commit" of some change, but did not push it. > - In the meantime you did your commit. > - Then, in rapid sequence: > git pull > git co

Re: automatically preventing merge commits on master

2009-03-07 Thread Bruno Haible
Hi Jim, Oops, I did it again. This time, I have a history of what I did, and I'm sure I worked in a single gnulib checkout: - Did a "git commit" of some change, but did not push it. - In the meantime you did your commit. - Then, in rapid sequence: git pull git commit ChangeLog modules/uni

Re: automatically preventing merge commits on master

2008-12-23 Thread Jim Meyering
Bruno Haible wrote: > Hi Jim, > > On 2008-10-13 you wrote: >> Does anyone object to my installing a server-side hook >> that would prevent pushing merge commits on master? >> In our experience here (with gnulib.git), pushing a merge >> commit is always unintentional. > > The one that I pushed toda

Re: automatically preventing merge commits on master

2008-12-22 Thread Bruno Haible
Hi Jim, On 2008-10-13 you wrote: > Does anyone object to my installing a server-side hook > that would prevent pushing merge commits on master? > In our experience here (with gnulib.git), pushing a merge > commit is always unintentional. The one that I pushed today was unintentional again. Sorry

Re: automatically preventing merge commits on master

2008-10-14 Thread Jim Meyering
Jim Meyering <[EMAIL PROTECTED]> wrote: > Simon Josefsson <[EMAIL PROTECTED]> wrote: >> Jim Meyering <[EMAIL PROTECTED]> writes: >> >>> Does anyone object to my installing a server-side hook >>> that would prevent pushing merge commits on master? >>> In our experience here (with gnulib.git), pushin

Re: automatically preventing merge commits on master

2008-10-13 Thread Bruno Haible
Hi Jim, > In our experience here (with gnulib.git), pushing a merge > commit is always unintentional. Yes, my mistake today. It was definitely unintentional. I was working in two gnulib checkouts at the same time, noticed the merge in one checkout and straightened it through "git rebase origin/ma

Re: automatically preventing merge commits on master

2008-10-13 Thread Jim Meyering
Simon Josefsson <[EMAIL PROTECTED]> wrote: > Jim Meyering <[EMAIL PROTECTED]> writes: > >> Does anyone object to my installing a server-side hook >> that would prevent pushing merge commits on master? >> In our experience here (with gnulib.git), pushing a merge >> commit is always unintentional. >

Re: automatically preventing merge commits on master

2008-10-13 Thread Simon Josefsson
Jim Meyering <[EMAIL PROTECTED]> writes: > Does anyone object to my installing a server-side hook > that would prevent pushing merge commits on master? > In our experience here (with gnulib.git), pushing a merge > commit is always unintentional. +1 from me. How would you do that? I'd like to do

automatically preventing merge commits on master

2008-10-13 Thread Jim Meyering
Does anyone object to my installing a server-side hook that would prevent pushing merge commits on master? In our experience here (with gnulib.git), pushing a merge commit is always unintentional.