Merge branch 'master' of https://github.com/Microsoft/TypeScript into feature/eslint

This commit is contained in:
Alexander
2019-06-23 18:49:35 +03:00
111 changed files with 2035 additions and 198 deletions

View File

@@ -36,9 +36,10 @@ async function main() {
Component commits:
${logText.trim()}`;
const logpath = path.join(__dirname, "../", "logmessage.txt");
const mergebase = runSequence([["git", ["merge-base", "origin/master", currentSha]]]).trim();
runSequence([
["git", ["checkout", "-b", "temp-branch"]],
["git", ["reset", "origin/master", "--soft"]]
["git", ["reset", mergebase, "--soft"]]
]);
fs.writeFileSync(logpath, logText);
runSequence([