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

[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 is a good idea, since it shows more
information about where the commit came from.

But if you want, you can use 'git rebase' to avoid the merge commit. In the
case of my 'gitignore' branch, you could have run the following commands:

    git remote add ndbroadbent git://
github.com/ndbroadbent/geany-plugins.git
    git fetch ndbroadbent
    git rebase ndbroadbent/gitignore
    git remote rm ndbroadbent


Cheers,
Nathan B
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.geany.org/pipermail/devel/attachments/20111213/7a0e6781/attachment.html>