@mattpolzin/harmony 5.6.0 → 5.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/README.md +16 -2
  2. package/harmony +564 -511
  3. package/man/harmony.1 +18 -2
  4. package/package.json +1 -1
package/README.md CHANGED
@@ -1,4 +1,4 @@
1
- % harmony(1) Version 5.6.0 | Harmony User's Guide
1
+ % harmony(1) Version 5.7.0 | Harmony User's Guide
2
2
 
3
3
  # NAME
4
4
  Harmony - Harmonize with coworkers around GitHub reviewing
@@ -312,7 +312,7 @@ organization.
312
312
 
313
313
  Running `harmony list <team>` will list the members of the given GitHub Team.
314
314
 
315
- ## `pr [--draft] [#label, ...]`
315
+ ## `pr [--draft] [-i/--into {<branch-name>}] [#label, ...]`
316
316
  With a branch checked out will reach out to GitHub to determine if there is an
317
317
  open PR for that branch. If there is a PR, Harmony will print a URI that can be
318
318
  used to view the PR. If there is not a PR, Harmony will help you create one. New
@@ -328,6 +328,14 @@ editor. If you do not have an `EDITOR` environment variable set, you will still
328
328
  be able to enter a description from the command line but PR templates are only
329
329
  supported when an `EDITOR` is specified.
330
330
 
331
+ If you are creating a new PR from a branch that refers to a GitHub issue (and
332
+ you have GitHub branch parsing enabled in your harmony config) then harmony will
333
+ prepend the issue information onto your new PR description in a commented out
334
+ block for you to reference or copy into the PR description as needed.
335
+
336
+ You can specify the branch to merge into via the `--into` CLI argument if you
337
+ want to as an alternative to the interactive prompt.
338
+
331
339
  You can also specify any number of labels to apply by prefixing them with '#'.
332
340
  For example, `harmony pr #backport #bugfix` would create a PR and apply the
333
341
  `backport` and `bugfix` labels.
@@ -351,6 +359,12 @@ Create a PR for the current branch and add the `urgent` label:
351
359
  harmony pr #urgent
352
360
  ```
353
361
 
362
+ Create a pull request that will merge into the hypothetical pre-existing
363
+ `release/2_0` branch:
364
+ ```shell
365
+ harmony pr --into release/2_0
366
+ ```
367
+
354
368
  ## `quick [--bugfix]`
355
369
  Helps you create a new GitHub issue and a branch to work on that issue all in
356
370
  one go. The branch name will be structured such that if you have GitHub branch