|
3 | 3 | A custom Git command for managing pull requests. You can run it as |
4 | 4 | `git-node` or `git node`. To see the help text, run `git node`. |
5 | 5 |
|
6 | | -- [Prerequistes](#prerequistes) |
7 | 6 | - [`git node land`](#git-node-land) |
| 7 | + - [Prerequistes](#git-node-land-prerequistes) |
8 | 8 | - [Git bash for Windows](#git-bash-for-windows) |
9 | 9 | - [Demo & Usage](#demo--usage) |
10 | 10 | - [`git node backport`](#git-node-backport) |
11 | 11 | - [Example](#example) |
12 | 12 | - [`git node sync`](#git-node-sync) |
13 | 13 | - [`git node metadata`](#git-node-metadata) |
14 | 14 | - [`git node v8`](#git-node-v8) |
| 15 | + - [Prerequistes](#git-node-v8-prerequistes) |
15 | 16 | - [`git node v8 major`](#git-node-v8-major) |
16 | 17 | - [`git node v8 minor`](#git-node-v8-minor) |
17 | 18 | - [`git node v8 backport <sha..>`](#git-node-v8-backport-sha) |
18 | 19 | - [General options](#general-options) |
19 | 20 | - [`git node wpt`](#git-node-wpt) |
20 | 21 | - [Example](#example-1) |
21 | 22 |
|
22 | | -## Prerequistes |
| 23 | +## `git node land` |
| 24 | + |
| 25 | +``` |
| 26 | +git-node land [prid|options] |
| 27 | +
|
| 28 | +Manage the current landing session or start a new one for a pull request |
| 29 | +
|
| 30 | +Positionals: |
| 31 | + prid, options ID of the Pull Request [number] |
| 32 | +
|
| 33 | +Options: |
| 34 | + --version Show version number [boolean] |
| 35 | + --help Show help [boolean] |
| 36 | + --apply Apply a patch with the given PR id [number] |
| 37 | + --amend Amend the current commit [boolean] |
| 38 | + --continue, -c Continue the landing session [boolean] |
| 39 | + --final Verify the landed PR and clean up [boolean] |
| 40 | + --abort Abort the current landing session [boolean] |
| 41 | +
|
| 42 | +Examples: |
| 43 | + git node land 12344 Land https://github.com/nodejs/node/pull/12344 in |
| 44 | + the current directory |
| 45 | + git node land --abort Abort the current session |
| 46 | + git node land --amend Append metadata to the current commit message |
| 47 | + git node land --final Verify the landed PR and clean up |
| 48 | + git node land --continue Continue the current landing session |
| 49 | +``` |
| 50 | + |
| 51 | +<a id="git-node-land-prerequistes"></a> |
23 | 52 |
|
24 | | -Note: the prerequistes are not required for `git node v8`. |
| 53 | +### Prerequistes |
25 | 54 |
|
26 | 55 | 1. See the readme on how to |
27 | 56 | [set up credentials](../README.md#setting-up-credentials). |
@@ -52,34 +81,6 @@ Note: the prerequistes are not required for `git node v8`. |
52 | 81 | $ ncu-config set branch master |
53 | 82 | ``` |
54 | 83 |
|
55 | | -## `git node land` |
56 | | - |
57 | | -``` |
58 | | -git-node land [prid|options] |
59 | | -
|
60 | | -Manage the current landing session or start a new one for a pull request |
61 | | -
|
62 | | -Positionals: |
63 | | - prid, options ID of the Pull Request [number] |
64 | | -
|
65 | | -Options: |
66 | | - --version Show version number [boolean] |
67 | | - --help Show help [boolean] |
68 | | - --apply Apply a patch with the given PR id [number] |
69 | | - --amend Amend the current commit [boolean] |
70 | | - --continue, -c Continue the landing session [boolean] |
71 | | - --final Verify the landed PR and clean up [boolean] |
72 | | - --abort Abort the current landing session [boolean] |
73 | | -
|
74 | | -Examples: |
75 | | - git node land 12344 Land https://github.com/nodejs/node/pull/12344 in |
76 | | - the current directory |
77 | | - git node land --abort Abort the current session |
78 | | - git node land --amend Append metadata to the current commit message |
79 | | - git node land --final Verify the landed PR and clean up |
80 | | - git node land --continue Continue the current landing session |
81 | | -``` |
82 | | - |
83 | 84 | ### Git bash for Windows |
84 | 85 |
|
85 | 86 | If you are using `git bash` and having trouble with output use |
@@ -232,7 +233,24 @@ git node metadata 167 --repo llnode --readme ../node/README.md |
232 | 233 | ## `git node v8` |
233 | 234 |
|
234 | 235 | Update or patch the V8 engine. |
235 | | -This tool will maintain a clone of the V8 repository in `~/.update-v8/v8`. |
| 236 | +This tool will maintain a clone of the V8 repository in `~/.update-v8/v8` |
| 237 | +if it's used without `--v8-dir`. |
| 238 | + |
| 239 | +<a id="git-node-v8-prerequistes"></a> |
| 240 | + |
| 241 | +### Prerequistes |
| 242 | + |
| 243 | +If you are on macOS, the version of `patch` command bundled in the system may |
| 244 | +be too old for `git node v8` to work. Try installing a newer version of patch |
| 245 | +before using this tool. For instance, with homebrew: |
| 246 | + |
| 247 | +``` |
| 248 | +$ brew install gpatch |
| 249 | +``` |
| 250 | + |
| 251 | +And make sure `which patch` points to `/usr/local/bin/patch` installed by |
| 252 | +homebrew instead of `/usr/bin/patch` that comes with the system (e.g. by |
| 253 | +modifying yoru `PATH` environment variable). |
236 | 254 |
|
237 | 255 | ### `git node v8 major` |
238 | 256 |
|
|
0 commit comments