One can use
git config branch.master.rebase true
or
git config --global branch.master.rebase true

Daniel Juyung Seo (SeoZ)


On Sun, Sep 8, 2013 at 8:56 PM, ryuan Choi <[email protected]> wrote:

> Could anyone try to use hook to prevent merge commit?
>
> I googled and found update hook.
>
> https://phab.enlightenment.org/P39
>
>
> 2013/9/6 Lucas De Marchi <[email protected]>
>
> > On Thu, Sep 5, 2013 at 11:01 AM, Chris Michael <[email protected]>
> > wrote:
> > > On 09/05/13 03:18, Cedric BAIL wrote:
> > >> On Wed, Sep 4, 2013 at 3:37 PM, Chris Michael - Enlightenment Git
> > >> <[email protected]> wrote:
> > >>> devilhorns pushed a commit to branch master.
> > >>>
> > >>> commit 03604a15b6158fdefcfb0f833567dbf91b38c659
> > >>> Merge: 88cc896 609941e
> > >>> Author: Chris Michael <[email protected]>
> > >>> Date:   Wed Sep 4 14:36:29 2013 +0100
> > >>>
> > >>>      Merge branch 'framespace'
> > >> May I say that we did agree against merging branch...
> > >>
> > > You sure may. In fact, you can say anything you wish.
> > >
> > > May I say ... French Borker !! :P
> > >
> >
> > Jokes aside, we did agree not to merge things like this.  And you were
> > just 3 commit behind master, you could very easily "git rebase
> > origin/master" before pushing. Hoping this was just an isolated
> > mistake.
> >
> > Lucas De Marchi
> >
> >
> >
> ------------------------------------------------------------------------------
> > Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
> > Discover the easy way to master current and previous Microsoft
> technologies
> > and advance your career. Get an incredible 1,500+ hours of step-by-step
> > tutorial videos with LearnDevNow. Subscribe today and save!
> >
> http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
> > _______________________________________________
> > enlightenment-devel mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
> >
>
> ------------------------------------------------------------------------------
> Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
> Discover the easy way to master current and previous Microsoft technologies
> and advance your career. Get an incredible 1,500+ hours of step-by-step
> tutorial videos with LearnDevNow. Subscribe today and save!
> http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
> _______________________________________________
> enlightenment-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
------------------------------------------------------------------------------
Learn the latest--Visual Studio 2012, SharePoint 2013, SQL 2012, more!
Discover the easy way to master current and previous Microsoft technologies
and advance your career. Get an incredible 1,500+ hours of step-by-step
tutorial videos with LearnDevNow. Subscribe today and save!
http://pubads.g.doubleclick.net/gampad/clk?id=58041391&iu=/4140/ostg.clktrk
_______________________________________________
enlightenment-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to