Interesting Reading on Git, GitHub

Tobias Megies edited this page Mar 27, 2017 · 9 revisions
hub pull-request -i 1704 -b obspy:master -h obspy:trace_always_contiguous
  • or via a simple POST command, e.g. using curl:
curl --user megies --request POST --data '{"issue": "2", "head": "megies:testbranch2", "base": "master"}'
# 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"}'
  - **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)
# 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