Skip to content

backport: backporting misaligned "node --help" text to v7.x staging - #11114

Merged
joshgav merged 1 commit into
nodejs:v7.x-stagingfrom
aashil:misaligned-help-text-backport-v7.x-staging
Feb 7, 2017
Merged

backport: backporting misaligned "node --help" text to v7.x staging#11114
joshgav merged 1 commit into
nodejs:v7.x-stagingfrom
aashil:misaligned-help-text-backport-v7.x-staging

Conversation

@aashil

Copy link
Copy Markdown
Contributor
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

This PR backports commits 5d27cc1 and 6ff3b03 to v7.x-staging.
Reference PR: #10948

@nodejs-github-botnodejs-github-bot added build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations. meta Issues and PRs related to the general management of the project. labels Feb 2, 2017
@mscdex

Copy link
Copy Markdown
Contributor

@aashil It looks like you targeted the wrong branch. Currently this PR is based against master instead of v7.x-staging.

@aashil
aashil changed the base branch from master to v7.x-stagingFebruary 2, 2017 02:06
@aashil

aashil commented Feb 2, 2017

Copy link
Copy Markdown
ContributorAuthor

Sorry about that. Fixed

@jasnell

Copy link
Copy Markdown
Member

Should the --inspect-brk commit be included in this one?

@aashil

Copy link
Copy Markdown
ContributorAuthor

Tagging @evanlucas and @Trott. They can answer more on this.

@Trott

Trott commented Feb 3, 2017

Copy link
Copy Markdown
Member

Should the --inspect-brk commit be included in this one?

¯\(ツ)

@joshgav@evanlucas

@joshgav

Copy link
Copy Markdown
Contributor

let me look into backporting --inspect-brk today. this PR should land after that one.

@joshgav

Copy link
Copy Markdown
Contributor

oh i didn't look closely, I see @aashil has already included backport of #8979 in this PR. let me review then.

@joshgav

Copy link
Copy Markdown
Contributor

@aashil I think it will be simpler to backport #8979 separately from this, so I submitted a backport PR as #11149. Could you remove the extra commit from this PR and rebase your commit on top of #11149? Thanks!

@aashil
aashilforce-pushed the misaligned-help-text-backport-v7.x-staging branch from fe71c3a to 7ebae4bCompareFebruary 3, 2017 19:11
@aashil

Copy link
Copy Markdown
ContributorAuthor

I justed removed the commit and rebased off your branch.

@joshgavjoshgav mentioned this pull request Feb 3, 2017
4 tasks
@italoacasas

italoacasas commented Feb 6, 2017

Copy link
Copy Markdown

@joshgav
joshgavforce-pushed the misaligned-help-text-backport-v7.x-staging branch from 7ebae4b to 1398ed6CompareFebruary 7, 2017 22:41
The alignment of the argument descriptions in the "node --help"
text is off. This commit fixes the issue by adding two spaces
before each of the argument description.
PR-URL: nodejs#10948Fixes: nodejs#10935
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Josh Gavant <josh.gavant@outlook.com>
@joshgav
joshgavforce-pushed the misaligned-help-text-backport-v7.x-staging branch from 1398ed6 to 3d49d3bCompareFebruary 7, 2017 22:45
@joshgav
joshgav merged commit 3d49d3b into nodejs:v7.x-stagingFeb 7, 2017
@joshgav

Copy link
Copy Markdown
Contributor

ARM and OSX failures in CI are unrelated. Rebased and landed in 3d49d3b

Thanks @aashil!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

buildIssues and PRs related to build files or the CI.docIssues and PRs related to the documentations.metaIssues and PRs related to the general management of the project.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@aashil@mscdex@jasnell@Trott@joshgav@italoacasas@nodejs-github-bot