[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] 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

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' commit

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

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's also

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 not

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 github to do