Interesting Reading on Git, GitHub

• github development workflow
  • http://scottchacon.com/2011/08/31/github-flow.html
  • http://nvie.com/posts/a-successful-git-branching-model/
• convert existing issue into a pull request
  • can be done using github/hub
  • or via a simple POST command, e.g. using curl:

curl --user megies --request POST --data '{"issue": "2", "head": "megies:testbranch2", "base": "master"}' https://api.github.com/repos/obspy/obspy/pulls
# in case of 2-factor authentication enabled..
curl --header "X-GitHub-OTP: 123456" --user megies --request POST --data '{"issue": "2", "head": "megies:testbranch2", "base": "master"}' https://api.github.com/repos/obspy/obspy/pulls

  - **issue**: number of the *already existing* normal issue
  - **head**: *repository/branch* that should be pulled in
  - **base**: branch that the pull request should be merged into (target repository specified in the url), usually either `master` (for feature branches) or `releases` (for bug fixes)

• interaction with svn
  • https://github.com/blog/1178-collaborating-on-github-with-subversion
• Squash commits using git rebase

# squash the last 4 commits interactively
# Only do this on a branch no one else is using
git rebase -i HEAD~4
git push --force upstream my_feature_branch