shrub/sh
Jared Tobin baedc50567
sh: replace merge helper [ci skip]
Replaces the 'merge-and-update-solid' script with the simpler
'merge-with-custom-msg' which merges branches using a custom merge
commit message.

Maintainers may want to alias it locally via something like:

  git config alias.mu '!sh/merge-with-custom-msg'

Then use it via:

  git mu SOME_BRANCH SOME_PR_NUMBER
2019-12-07 17:05:26 +08:00
..
boot Get cross-compilation ready for release. (#1263) 2019-05-02 13:13:48 -07:00
bootstrap Nix Build + Monorepo Structure (#1196) 2019-03-04 16:43:53 -08:00
build-interface build: add :soto, always install dependencies [ci skip] 2019-11-26 09:56:31 +08:00
cachix only update cachix if credentials are available 2019-07-15 14:46:36 -07:00
ci-tests removes brass pill staging from merge builds in CI 2019-07-01 14:16:02 -07:00
create-ropsten-pills build: use HEAD in sh/create-ropsten-pills 2019-11-06 20:14:51 +09:00
cross Get cross-compilation ready for release. (#1263) 2019-05-02 13:13:48 -07:00
image build: simplify image build interface 2019-10-22 10:18:37 +08:00
load-arvo Misc cleanup blocking CC-Release. (#1249) 2019-04-24 17:27:27 -07:00
merge-with-custom-msg sh: replace merge helper [ci skip] 2019-12-07 17:05:26 +08:00
print-core-backtrace Nix Build + Monorepo Structure (#1196) 2019-03-04 16:43:53 -08:00
release Get cross-compilation ready for release. (#1263) 2019-05-02 13:13:48 -07:00
test fixes unit-test failure predicate to also catch +test failures 2019-08-08 23:31:15 -07:00
test-arvo-upgrade-path sh: add OTA test helper script [ci skip] 2019-11-15 19:42:55 +08:00
update-brass-pill Get cross-compilation ready for release. (#1263) 2019-05-02 13:13:48 -07:00
update-ivory-pill Added update-ivory-pill script 2019-07-19 16:05:46 -07:00
update-solid-pill Get cross-compilation ready for release. (#1263) 2019-05-02 13:13:48 -07:00