Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Colomban Wendling
Le 13/12/2011 10:33, Nathan Broadbent a écrit : >>> You can't do a cherry pick or rebase through the front-end. I think >>> adding this 'merge pull request' commit is a good idea, since it shows >>> more information about where the commit came from. >> >> OK. So I assume its best practice also on g

Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Nathan Broadbent
> And another question: Is github allowing to do an automatic rebase for > forks? > E.g. I have forked geany-plugins into my namespace > https://github.com/frlan/geany-plugins > and want to keep it up to date. Do I need to to it locally with git > remote --add etc. or is there any gui for? It's no

Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Frank Lanitz
Am 13.12.2011 10:33, schrieb Nathan Broadbent: >>> You can't do a cherry pick or rebase through the front-end. I think >>> adding this 'merge pull request' commit is a good idea, since it shows >>> more information about where the commit came from. >> >> OK. So I assume its best practice also on gi

Re: [Geany-devel] Wrap words Addon patch

2011-12-13 Thread Nathan Broadbent
> Now that the geany-plugins has been converted to Git, I thought I'd post > this patch that adds the feature I've been working on (wrapping text with > characters) to the Addons plugin.  Any chance of it being added? Hi Alex, Now that geany-plugins is on github, we can take advantage of the awes

Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Nathan Broadbent
> > You can't do a cherry pick or rebase through the front-end. I think > > adding this 'merge pull request' commit is a good idea, since it shows > > more information about where the commit came from. > > OK. So I assume its best practice also on github to do so? Yes, this is a best practice. It'

Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Frank Lanitz
Am 13.12.2011 09:51, schrieb Nathan Broadbent: > See question from subject line. How can I merge a pull request without > adding a new commit stating the merge? Is there some kind of ff or > cherry-pick available through front end? > You can't do a cherry pick or rebase through the fro

Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Nathan Broadbent
> > See question from subject line. How can I merge a pull request without > adding a new commit stating the merge? Is there some kind of ff or > cherry-pick available through front end? > Hi, You can't do a cherry pick or rebase through the front-end. I think adding this 'merge pull request' com

Re: [Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Thomas Martitz
Am 13.12.2011 09:24, schrieb Frank Lanitz: Hi folks, See question from subject line. How can I merge a pull request without adding a new commit stating the merge? Is there some kind of ff or cherry-pick available through front end? Cheers, Frank It'll automatically fast-forward if it's possib

[Geany-devel] Just a stupid github question: How to merge a pull request with fast forward?

2011-12-13 Thread Frank Lanitz
Hi folks, See question from subject line. How can I merge a pull request without adding a new commit stating the merge? Is there some kind of ff or cherry-pick available through front end? Cheers, Frank ___ Geany-devel mailing list Geany-devel@uvena.de

Re: [Geany-devel] GtkBuilder is in!

2011-12-13 Thread Matthew Brush
On 12/12/2011 10:14 PM, Frank Lanitz wrote: Am 11.12.2011 01:21, schrieb Matthew Brush: - more testing on win32 Current nightly build of 12/12/11 did not start do to missing symbol on my box. A screenshot from my German Windows 7: http://frank.uvena.de/tmp/geany_error.png Its telling: g_mal

Re: [Geany-devel] Geany-Plugins: git repo up and running

2011-12-13 Thread Frank Lanitz
Am 12.12.2011 22:36, schrieb Jiří Techet: > On Mon, Dec 12, 2011 at 14:54, Frank Lanitz wrote: >> Hi folks, >> >> Just I case you missed the news inside the threads: the new git repo for >> geany-plugins is online and can be found at >> https://github.com/geany/geany-plugins > > Hi Frank, > > it

Re: [Geany-devel] [geanyprj] coding style patch

2011-12-13 Thread Frank Lanitz
Am 13.12.2011 09:11, schrieb Matthew Brush: > On 12/12/2011 11:02 PM, Yura Siamashka wrote: >> Hi >> >> Sorry I didn't follow conversion to github and I am not really >> familiar with new workflow. >> >> So as GeanyPrj maintainer how do I commit patch to mainline? Should my >> github user be added

Re: [Geany-devel] GtkBuilder is in!

2011-12-13 Thread Frank Lanitz
Am 13.12.2011 07:45, schrieb Matthew Brush: > On 12/12/2011 10:27 PM, Frank Lanitz wrote: >> Am 13.12.2011 07:22, schrieb Matthew Brush: >>> On 12/12/2011 10:14 PM, Frank Lanitz wrote: Am 11.12.2011 01:21, schrieb Matthew Brush: > - more testing on win32 Current nightly build

Re: [Geany-devel] [geanyprj] coding style patch

2011-12-13 Thread Matthew Brush
On 12/12/2011 11:02 PM, Yura Siamashka wrote: Hi Sorry I didn't follow conversion to github and I am not really familiar with new workflow. So as GeanyPrj maintainer how do I commit patch to mainline? Should my github user be added to "main" geany-plugins repository or I need to create new fo