Re: Usage of pull rebasing and merges

2011-02-08 Thread David Jarvie
On Tue, February 8, 2011 9:08 am, Ben Cooksley wrote: On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg tr...@kde.org wrote: Hi Ben, could you please elaborate on this. I do not understand the problem at all. What is so bad about rebasing and what is wrong with the commit you mention? Cheers,

Re: Review Request: New KIO::http_post and KIO::StoredHttpPost APIs that accept a QIODevice as input...

2011-02-08 Thread David Faure
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100516/#review1305 --- Ship it! Looks good, but... kio/kio/job.cpp

Re: Usage of pull rebasing and merges

2011-02-08 Thread Oswald Buddenhagen
On Tue, Feb 08, 2011 at 09:20:55PM +1300, Ben Cooksley wrote: Do not run git pull --rebase after performing the merge, under any circumstances. ding ding ding - bingo! On Wed, Feb 02, 2011 at 10:27:02AM +0100, Oswald Buddenhagen wrote: and remember that following receipes does *not* work if

Re: [Kde-scm-interest] Re: Usage of pull rebasing and merges

2011-02-08 Thread Alexander Neundorf
On Tuesday 08 February 2011, Boudewijn Rempt wrote: On Tuesday 08 February 2011, Oswald Buddenhagen wrote: - just throw away the merge with git reset --hard HEAD~1 and redo it after git pull-ing. preferably, you should have git rerere enabled, so you won't have to repeat resolving

Re: Usage of pull rebasing and merges

2011-02-08 Thread Sebastian Trüg
Hi Ben, thanks for clarifying. :) Another point to add to my growing list of git tips. Cheers, Sebastian On 02/08/2011 10:08 AM, Ben Cooksley wrote: On Tue, Feb 8, 2011 at 9:49 PM, Sebastian Trüg tr...@kde.org wrote: Hi Ben, could you please elaborate on this. I do not understand the

Re: Merge or Cherry-Pick?

2011-02-08 Thread Nicolás Alvarez
On 03/02/2011, Johannes Sixt j.s...@viscovery.net wrote: Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: So I git cloned KDE/4.6 into some local branch (git checkout KDE/4.6; git checkout -b toolbuttons), then fix, then test. Now I want to merge to the KDE/4.6 branch; thats easy. Then I

Re: Usage of pull rebasing and merges

2011-02-08 Thread Wolfgang Rohdewald
On Dienstag 08 Februar 2011, Christoph Feck wrote: I don't want to. Not yet. But the more I read here, the more confused I get. the book Pro Git was/is very helpful for me and easy to read. However my copy from 2009 does not mention rerere yet http://progit.org/2010/03/08/rerere.html --

Re: Merge or Cherry-Pick?

2011-02-08 Thread Ian Monroe
2011/2/8 Nicolás Alvarez nicolas.alva...@gmail.com: On 03/02/2011, Johannes Sixt j.s...@viscovery.net wrote: Am 2/3/2011 12:15, schrieb Hugo Pereira Da Costa: Before anybody begins to work in this way, someone with sufficient knowlege must introduce the first real merge of the 4.6 branch into

Re: git clone kde:kde-workspace hangs

2011-02-08 Thread Ian Monroe
On Mon, Feb 7, 2011 at 16:29, Martin Koller kol...@aon.at wrote: On Sunday, 6. February 2011 23:54:07 Thiago Macieira wrote: On Sunday, 6 de February de 2011 16:48:21 Shaun Reich wrote: On Sun, Feb 6, 2011 at 4:30 PM, Martin Koller kol...@aon.at wrote: Hi, I've tried already several

Review Request: Clearing scrollback and resetting does not present a new prompt

2011-02-08 Thread José Manuel Santamaría Lema
--- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100611/ --- Review request for Konsole. Summary --- Hi, I can reproduce bug

GSoC ideas needed - 20 days until org application - last call

2011-02-08 Thread Lydia Pintscher
Heya folks :) We have 20 days left until org application opens for GSoC 2011. By that point we should have as many rocking ideas as possible on this wiki page: http://community.kde.org/GSoC/2011/Ideas It will be used to evaluate our application. Please add your ideas. It'd be awesome if we could