Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Conversation

aashil
Copy link
Contributor

@aashil aashil commented Feb 2, 2017

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-bot nodejs-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
Contributor

mscdex commented Feb 2, 2017

@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-staging February 2, 2017 02:06
@aashil
Copy link
Contributor Author

aashil commented Feb 2, 2017

Sorry about that. Fixed

@jasnell
Copy link
Member

jasnell commented Feb 2, 2017

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

@aashil
Copy link
Contributor Author

aashil commented Feb 3, 2017

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

@Trott
Copy link
Member

Trott commented Feb 3, 2017

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

¯\(ツ)

@joshgav @evanlucas

@joshgav
Copy link
Contributor

joshgav commented Feb 3, 2017

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

@joshgav
Copy link
Contributor

joshgav commented Feb 3, 2017

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
Contributor

joshgav commented Feb 3, 2017

@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 aashil force-pushed the misaligned-help-text-backport-v7.x-staging branch from fe71c3a to 7ebae4b Compare February 3, 2017 19:11
@aashil
Copy link
Contributor Author

aashil commented Feb 3, 2017

I justed removed the commit and rebased off your branch.

@joshgav joshgav mentioned this pull request Feb 3, 2017
4 tasks
@italoacasas
Copy link
Contributor

italoacasas commented Feb 6, 2017

@joshgav joshgav force-pushed the misaligned-help-text-backport-v7.x-staging branch from 7ebae4b to 1398ed6 Compare February 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#10948
Fixes: nodejs#10935
Reviewed-By: Evan Lucas <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Josh Gavant <[email protected]>
@joshgav joshgav force-pushed the misaligned-help-text-backport-v7.x-staging branch from 1398ed6 to 3d49d3b Compare February 7, 2017 22:45
@joshgav joshgav merged commit 3d49d3b into nodejs:v7.x-staging Feb 7, 2017
@joshgav
Copy link
Contributor

joshgav commented Feb 7, 2017

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

Thanks @aashil!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants