Project

General

Profile

Actions

Github » History » Revision 1

Revision 1/2 | Next »
stbuehler, 2011-05-18 21:40


Github

The lighttpd2 git branch is synced to github.
If you have a github account you can easily fork from it there and create pull requests.

Internal merge handling

Right now we only push to git on lighttpd.net, which syncs to github; we don't change github directly, which also means we cannot use the "easy direct merge" feature for pull requests on github. Here is how to merge:

  • get the url for the pull request source repo "url" and the commit hash/branch name "hash" for it
  • # git fetch <url> <hash>
  • # git merge FETCH_HEAD
  • # git push

or like described here: http://help.github.com/pull-requests/#merging_a_pull_request

Updated by stbuehler almost 13 years ago · 1 revisions