söndagen den 19 februari 2012 14.36.07 skrev Stephen Kelly:
> I was reviewing the changes in the frameworks branch from yesterday.
> Something I noticed was that there are a lot of merge commits that don't
> need to exist.
Heh, sounds familiar, the same thing was brought up when Qt switched to
On Feb 20, 2012 7:12 AM, "Stephen Kelly" wrote:
>
> Dario Freddi wrote:
>
> > 2012/2/19 Stephen Kelly :
> >> Stephen Kelly wrote:
> >>
> >>>
> >>> Hi there,
> >>>
> >>> I was reviewing the changes in the frameworks branch from yesterday.
> >>> Something I noticed was that there are a lot of merge
On 19 February 2012 13:36, Stephen Kelly wrote:
>
> Hi there,
>
> I was reviewing the changes in the frameworks branch from yesterday.
> Something I noticed was that there are a lot of merge commits that don't
> need to exist.
>
> Please use `gitk` to see them.
>
> The unneeded merge commits actua
Hi,
> There's some ideas for such hooks on the Internet already:
Yes, there are things flowing around, whereas it would be nice to have
a "Getting started" frameworks contribution page, where the advices
(requirements) could be mentioned, like this. Is there already
something like that ?
Best Re
> Is there already something like that ?
There is already something here:
http://community.kde.org/Frameworks/Git_Workflow#Local_branches_are_always_rebased.2C_remote_branches_never
Might be a good idea to extend it with "git config
branch.autosetuprebase always" and the gitk advice.
-- Laszlo
_
On Sunday 19 February 2012, Stephen Kelly wrote:
> Laszlo Papp wrote:
> >> Is there already something like that ?
> >
> > There is already something here:
> http://community.kde.org/Frameworks/Git_Workflow#Local_branches_are_always_
> rebased.2C_remote_branches_never
>
> > Might be a good idea to
2012/2/19 Ben Cooksley :
>
> First, our hooks are in python - so any changes would need to be in Python
> as well.
I can speak a bit of python, would be a nice way for learning more :)
>
> Second, there is a legitimate use for pushing merge commits - namely
> integrating a seperate remote branch.
2012/2/19 Stephen Kelly :
> Stephen Kelly wrote:
>
>>
>> Hi there,
>>
>> I was reviewing the changes in the frameworks branch from yesterday.
>> Something I noticed was that there are a lot of merge commits that don't
>> need to exist.
>
> Ugh. Yet more of this just appeared... Recent history in th
