Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1816,7 +1816,7 @@ private void ClearHistoryByID()
);
}
else
{// if id,count adn newest parameters are present
{// if id,count and newest parameters are present
// throw an exception for invalid count values

long id = _id[0];
Expand Down
2 changes: 1 addition & 1 deletion tools/releaseTools.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ function Get-ChangeLog
## and eventually merge the release branch back to the master branch. This will result in different commit nodes
## in master branch that actually represent same set of changes.
##
## In this case, we cannot simply use the revision range "$tag_hash..HEAD" becuase it will include the original
## In this case, we cannot simply use the revision range "$tag_hash..HEAD" because it will include the original
## commits in the master branch that were cherry-picked to the release branch -- they are reachable from 'HEAD'
## but not reachable from the last release tag. Instead, we need to exclude the commits that were cherry-picked,
## and only include the commits that are not in the last release into the change log.
Expand Down