From f0ae9fd608366a360b8d919c6c49e5609a811efb Mon Sep 17 00:00:00 2001 From: James Date: Mon, 28 Dec 2020 17:09:15 +0000 Subject: [PATCH] custom build merge script --- make_custom.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 make_custom.sh diff --git a/make_custom.sh b/make_custom.sh new file mode 100644 index 0000000..faf4153 --- /dev/null +++ b/make_custom.sh @@ -0,0 +1,14 @@ +cd src + +git checkout master + +git fetch upstream +git merge upstream/master + +git branch -D build +git checkout -b build + +git fetch upstream pull/14122/head:stopwatch +git merge stopwatch + +git merge fix_commit_status_index