[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-kimageshop
Subject: Re: [calligra] krita: Port Krita fully to the NG iterators.
From: "C. Boemann" <cbo () boemann ! dk>
Date: 2012-05-07 14:07:19
Message-ID: 201205071607.20024.cbo () boemann ! dk
[Download RAW message or body]
This brings up the point that all devs (incl krita) should (i would say must)
be subscribed to calligra-devel mailing list. It doesn't contain many messages
besides such important stuff.
As a little extra:
git merge --squash <branch-nam>
does the squashing for you and produces a nice commit message with all the
individual commit messages in one.
all you have to do is:
git commit -a
On Monday 07 May 2012 15:56:41 Cyrille Berger Skott wrote:
> Hi,
>
> Because it was more or less decided that we merge branch by squashing the
> commits because it (arguably) makes it easier to "git bisect" (at least, it
> reduce the problem of non-compiling commits in branches).
>
> On Monday 07 May 2012, Lukast dev wrote:
> > Hi,
> >
> > we decided a long time ago that we will be doing regular merges with
> > branches, why you merged the branch by squashing the commits?
> >
> > Cheers
> > Lukas
> >
> > 2012/5/5 Boudewijn Rempt <boud@valdyas.org>:
> > > Git commit 5977effb17d6286651f9f9ad8a267cdb5ca7b9be by Boudewijn Rempt.
> > > Committed on 05/05/2012 at 16:34.
> > > Pushed by rempt into branch 'master'.
> > >
> > > Port Krita fully to the NG iterators.
> > >
> > > This is a squashed commit of the following:
> > >
> > > commit fd43060a9999ffbe12f920137bbb90d0e0effb8a
> > > Merge: d52a1c3 b32e3dd
> > > Author: Boudewijn Rempt <boud@valdyas.org>
> > > Date: Sat May 5 16:27:36 2012 +0200
> > >
> > > Merge branch 'master' into iterators
> > >
> > > commit d52a1c31d8ce83bdd5ff6ce22905794ba82022cc
> > > Author: Boudewijn Rempt <boud@valdyas.org>
> > > Date: Sat May 5 16:23:24 2012 +0200
> > >
> > > Fix transform worker
> > >
> > > Transform at 135 degrees works now.
> > >
> > > BUG:298901
>
> (...)
_______________________________________________
kimageshop mailing list
kimageshop@kde.org
https://mail.kde.org/mailman/listinfo/kimageshop
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic