From 348abed1de051c747bbdf703bbfe68d5277e2d7d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 17 Aug 2020 23:27:12 -0400 Subject: [PATCH 1/2] spelling: javascript Signed-off-by: Josh Soref --- docs/concepts-guidelines.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/concepts-guidelines.md b/docs/concepts-guidelines.md index 5e0f94c..026f327 100644 --- a/docs/concepts-guidelines.md +++ b/docs/concepts-guidelines.md @@ -146,7 +146,7 @@ Alternatively, use the action directly and reference the commit hash for the ver - uses: thirdparty/foo-action@172ec762f2ac8e050062398456fccd30444f8f30 ``` -This action uses [ncc](https://github.com/zeit/ncc) to compile the Node.js code and dependencies into a single Javascript file under the [dist](https://github.com/peter-evans/create-pull-request/tree/master/dist) directory. +This action uses [ncc](https://github.com/zeit/ncc) to compile the Node.js code and dependencies into a single JavaScript file under the [dist](https://github.com/peter-evans/create-pull-request/tree/master/dist) directory. ## Advanced usage From 5f45e30ff91d65ba007d52144a578b3e3d06ecdd Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 18 Aug 2020 12:51:12 -0400 Subject: [PATCH 2/2] spelling: uncommitted Signed-off-by: Josh Soref --- docs/assets/cpr-gitgraph.htm | 4 ++-- src/create-or-update-branch.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/assets/cpr-gitgraph.htm b/docs/assets/cpr-gitgraph.htm index 39e53ba..888e714 100644 --- a/docs/assets/cpr-gitgraph.htm +++ b/docs/assets/cpr-gitgraph.htm @@ -33,7 +33,7 @@ master.commit("Last commit on base"); const localMaster = gitgraph.branch("<#1> master (local)"); localMaster.commit({ - subject: "", + subject: "", body: "Changes made to the local base during the workflow", }) const remotePatch = gitgraph.branch("create-pull-request/patch"); @@ -48,7 +48,7 @@ const localMaster2 = gitgraph.branch("<#2> master (local)"); localMaster2.commit({ - subject: "", + subject: "", body: "Changes made to the updated local base during the workflow", }) remotePatch.merge({ diff --git a/src/create-or-update-branch.ts b/src/create-or-update-branch.ts index 700cc14..94e5a5d 100644 --- a/src/create-or-update-branch.ts +++ b/src/create-or-update-branch.ts @@ -96,7 +96,7 @@ export async function createOrUpdateBranch( // Save the working base changes to a temporary branch const tempBranch = uuidv4() await git.checkout(tempBranch, 'HEAD') - // Commit any uncomitted changes + // Commit any uncommitted changes if (await git.isDirty(true)) { core.info('Uncommitted changes found. Adding a commit.') await git.exec(['add', '-A'])