Skip to content

Commit 3c7c22a

Browse files
authored
Merge pull request #4041 from DSpirit/patch-1
Fix typo in track-merge-target and track-merge-message
2 parents 7ea6e0c + 57d134d commit 3c7c22a

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/input/docs/reference/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ branches:
245245
increment: Patch
246246
prevent-increment:
247247
of-merged-branch: true
248-
tracks-merge-target: false
249-
tracks-merge-message: true
248+
track-merge-target: false
249+
track-merge-message: true
250250
regex: ^master$|^main$
251251
source-branches: []
252252
is-source-branch-for: []

schemas/6.0/GitVersion.configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@
337337
]
338338
},
339339
"nullableOfBoolean3": {
340-
"description": "This branch related property controls the behvior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.",
340+
"description": "This branch related property controls the behavior whether to use the tagged (value set to true) or the incremented (value set to false) semantic version. Defaults to true.",
341341
"type": [
342342
"boolean",
343343
"null"

src/GitVersion.Configuration/Workflows/GitHubFlow/v1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ branches:
2424
increment: Patch
2525
prevent-increment:
2626
of-merged-branch: true
27-
tracks-merge-target: false
28-
tracks-merge-message: true
27+
track-merge-target: false
28+
track-merge-message: true
2929
regex: ^master$|^main$
3030
source-branches: []
3131
is-source-branch-for: []

0 commit comments

Comments
 (0)