Just a normal push. I was confused what it actually did. A pull is fetch + merge, right? I think that's what happened as I saw a merge commit as the latest commit after I pushed. If a push without a rebase is blocked I'd feel much better.
-- Lars ________________________________ From: Enis Söztutar <[email protected]> To: "[email protected]" <[email protected]>; lars hofhansl <[email protected]> Sent: Friday, May 23, 2014 4:19 PM Subject: Re: We have our first victim You should not be able to push before rebase. It should have failed because it is not fast forward. Did you do a normal push the first time or force push? Enis On Fri, May 23, 2014 at 4:16 PM, lars hofhansl <[email protected]> wrote: It would have prevented me from fixing the history, though, after I messed it up simply by forgetting to rebase before a push. >I do think that anybody who does a force push needs to explain him/herself, >though. > > >-- Lars > > > >________________________________ > From: Enis Söztutar <[email protected]> >To: "[email protected]" <[email protected]> >Sent: Friday, May 23, 2014 4:13 PM >Subject: Re: We have our first victim > > > >Force push should be disabled by default for all branches I think. > >Enis > > > >On Fri, May 23, 2014 at 3:35 PM, Andrew Purtell <[email protected]> wrote: > >> Makes sense, earlier Jake was talking about how 'trunk' is a "protected >> branch". >> >> >> On Fri, May 23, 2014 at 3:22 PM, Konstantin Boudnik <[email protected]> >> wrote: >> >> > I think INFRA only disables force-pushes to the master: the rest of the >> > branches is a fair game ;) >> > >> > Cos >> > >> > On Fri, May 23, 2014 at 03:12PM, lars hofhansl wrote: >> > > I just had to fix up the history on the 0.94 branch, because I forgot >> to >> > > rebase after a pull (and I had some committed changes already). >> > > >> > > git will happily let you push stuff, even if that messes up the history >> > (and >> > > reorder commits, in my case my local change was ordered before the >> pulled >> > > changes). >> > > It's not wrong, since I should have rebased my changes. Just... uhm... >> > surprising :) >> > > >> > > >> > > Scary, but it worked and at least git gives me enough tools to fix >> > things. >> > > >> > > -- Lars >> > > >> > > >> > > >> > > ________________________________ >> > > From: Andrew Purtell <[email protected]> >> > > To: "[email protected]" <[email protected]> >> > > Sent: Friday, May 23, 2014 10:22 AM >> > > Subject: We have our first victim >> > > >> > > >> > > Ram pushed up a commit as a new branch 'trunk' instead of to 'master'. >> I >> > > will file an infra ticket to nuke the new branch 'trunk' as this is >> going >> > > to confuse people. Objections? >> > > >> > > -- >> > > Best regards, >> > > >> > > ═ - Andy >> > > >> > > Problems worthy of attack prove their worth by hitting back. - Piet >> Hein >> > > (via Tom White) >> > >> >> >> >> -- >> Best regards, >> >> - Andy >> >> Problems worthy of attack prove their worth by hitting back. - Piet Hein >> (via Tom White) >>
