commit
8f96fd0252
3 changed files with 4 additions and 4 deletions
|
@ -33,7 +33,7 @@
|
||||||
master.commit("Last commit on base");
|
master.commit("Last commit on base");
|
||||||
const localMaster = gitgraph.branch("<#1> master (local)");
|
const localMaster = gitgraph.branch("<#1> master (local)");
|
||||||
localMaster.commit({
|
localMaster.commit({
|
||||||
subject: "<uncommited changes>",
|
subject: "<uncommitted changes>",
|
||||||
body: "Changes made to the local base during the workflow",
|
body: "Changes made to the local base during the workflow",
|
||||||
})
|
})
|
||||||
const remotePatch = gitgraph.branch("create-pull-request/patch");
|
const remotePatch = gitgraph.branch("create-pull-request/patch");
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
|
|
||||||
const localMaster2 = gitgraph.branch("<#2> master (local)");
|
const localMaster2 = gitgraph.branch("<#2> master (local)");
|
||||||
localMaster2.commit({
|
localMaster2.commit({
|
||||||
subject: "<uncommited changes>",
|
subject: "<uncommitted changes>",
|
||||||
body: "Changes made to the updated local base during the workflow",
|
body: "Changes made to the updated local base during the workflow",
|
||||||
})
|
})
|
||||||
remotePatch.merge({
|
remotePatch.merge({
|
||||||
|
|
|
@ -146,7 +146,7 @@ Alternatively, use the action directly and reference the commit hash for the ver
|
||||||
- uses: thirdparty/foo-action@172ec762f2ac8e050062398456fccd30444f8f30
|
- 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
|
## Advanced usage
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ export async function createOrUpdateBranch(
|
||||||
// Save the working base changes to a temporary branch
|
// Save the working base changes to a temporary branch
|
||||||
const tempBranch = uuidv4()
|
const tempBranch = uuidv4()
|
||||||
await git.checkout(tempBranch, 'HEAD')
|
await git.checkout(tempBranch, 'HEAD')
|
||||||
// Commit any uncomitted changes
|
// Commit any uncommitted changes
|
||||||
if (await git.isDirty(true)) {
|
if (await git.isDirty(true)) {
|
||||||
core.info('Uncommitted changes found. Adding a commit.')
|
core.info('Uncommitted changes found. Adding a commit.')
|
||||||
await git.exec(['add', '-A'])
|
await git.exec(['add', '-A'])
|
||||||
|
|
Loading…
Reference in a new issue