e0b31dbfef
build: merge-pr now checks that PR status is green before proceeding ( #21810 )
...
Optionally one can use `--force` to override and merge no non-green PR.
PR Close #21810
2018-01-26 14:50:41 -08:00
5713faa667
build: autosquashes SHAs as part of merge-pr script ( #21791 )
...
To support `git checkin --fixup` and `git checkin —squash`
we need to make sure that `merge-pr` squashes the sepecial
commits before they are merged.
For more details see:
https://robots.thoughtbot.com/autosquashing-git-commits
PR Close #21791
2018-01-25 22:12:11 -08:00
c7c5214029
build: merge PR to all branches per target: label ( #21739 )
...
PR Close #21739
2018-01-24 12:35:11 -08:00
e726d81822
build: force fetch PR in merge script ( #21295 )
...
Use `-f` when doing `git fetch` for the PR. Without
it the `git fetch` will not overwrite what is currently
fetched locally, in essence doing fast-forward only.
PR Close #21295
2018-01-05 15:01:55 -05:00
bc7a6d7b00
build: force upstream fetch before merge ( #21192 )
...
PR Close #21192
2017-12-27 17:42:03 -06:00
d1764fc3dd
build: Add GitHub scripts for rebasing PRs ( #18359 )
...
PR Close #18359
2017-08-28 18:44:39 -05:00
Miško Hevery