patchy-cli 0.0.4-pr.154.bd0fe47 → 0.0.4-pr.155.1bfd263

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 (2) hide show
  1. package/README.md +15 -15
  2. package/package.json +6 -6
package/README.md CHANGED
@@ -29,10 +29,10 @@ Create a folder for the fork: `mkdir spoon-knife-fork && cd spoon-knife-fork`
29
29
  `patchy init` creates your config: `./patchy.json` ([full reference](#patchyjson))
30
30
  ```json5
31
31
  {
32
- "repo_url": "https://github.com/octocat/spoon-knife",
32
+ "upstream_url": "https://github.com/octocat/spoon-knife",
33
33
  "patches_dir": "./patches/",
34
34
  "clones_dir": "./clones/",
35
- "repo_dir": "spoon-knife",
35
+ "upstream_dir": "spoon-knife",
36
36
  "ref": "main"
37
37
  }
38
38
  ```
@@ -78,7 +78,7 @@ To generate the patches for the changes run `patchy generate`:
78
78
 
79
79
  ### Reapplying patches:
80
80
 
81
- Reset the current upstream repo `patchy repo reset main`, which will reset everything to `main`:
81
+ Reset the current upstream repo `patchy upstream reset main`, which will reset everything to `main`:
82
82
 
83
83
  ```
84
84
  ./
@@ -187,44 +187,44 @@ The `patches/` directory (customizable via [`patches_dir`](#patchyjson)) uses th
187
187
 
188
188
  ### `patchy generate`
189
189
 
190
- Generate `.diff` files and new files into `./patches/` based on current `git diff` in `repo_dir`.
190
+ Generate `.diff` files and new files into `./patches/` based on current `git diff` in `upstream_dir`.
191
191
 
192
192
  ```sh
193
- patchy generate [--repo-dir] [--patches-dir] [--dry-run]
193
+ patchy generate [--upstream-dir] [--patches-dir] [--dry-run]
194
194
  ```
195
195
 
196
196
  Note: `patchy generate` is destructive and will remove any unneeded files in your `./patches/` folder.
197
197
 
198
198
  ### `patchy apply`
199
199
 
200
- Apply patch files from `patches/` into `repo_dir`.
200
+ Apply patch files from `patches/` into `upstream_dir`.
201
201
 
202
202
  ```sh
203
- patchy apply [--repo-dir] [--patches-dir] [--dry-run]
203
+ patchy apply [--upstream-dir] [--patches-dir] [--dry-run]
204
204
  ```
205
205
 
206
- ### `patchy repo reset`
206
+ ### `patchy upstream reset`
207
207
 
208
- Hard reset the Git working tree of `repo_dir`. Discards local changes.
208
+ Hard reset the Git working tree of `upstream_dir`. Discards local changes.
209
209
 
210
210
  ```sh
211
- patchy repo reset [--repo-dir]
211
+ patchy upstream reset [--upstream-dir]
212
212
  ```
213
213
 
214
- ### `patchy repo checkout --ref <git-ref>`
214
+ ### `patchy upstream checkout --ref <git-ref>`
215
215
 
216
- Check out a specific Git ref (branch, tag, or SHA) in `repo_dir`.
216
+ Check out a specific Git ref (branch, tag, or SHA) in `upstream_dir`.
217
217
 
218
218
  ```sh
219
- patchy repo checkout --ref main [--repo-dir]
219
+ patchy upstream checkout --ref main [--upstream-dir]
220
220
  ```
221
221
 
222
- ### `patchy repo clone --url <git-url>`
222
+ ### `patchy upstream clone --url <git-url>`
223
223
 
224
224
  Clone a repository into a subdirectory of `clones_dir`. The target directory is derived from the repo name.
225
225
 
226
226
  ```sh
227
- patchy repo clone [--clones-dir] [--ref] [--repo-url]
227
+ patchy upstream clone [--clones-dir] [--ref] [--upstream-url]
228
228
  ```
229
229
 
230
230
  ## License
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "patchy-cli",
3
- "version": "0.0.4-pr.154.bd0fe47",
3
+ "version": "0.0.4-pr.155.1bfd263",
4
4
  "description": "A CLI tool for managing Git patch workflows.",
5
5
  "type": "module",
6
6
  "bin": {
@@ -60,11 +60,11 @@
60
60
  "url": "https://github.com/richardgill/patchy"
61
61
  },
62
62
  "optionalDependencies": {
63
- "patchy-cli-linux-x64": "0.0.4-pr.154.bd0fe47",
64
- "patchy-cli-linux-arm64": "0.0.4-pr.154.bd0fe47",
65
- "patchy-cli-darwin-x64": "0.0.4-pr.154.bd0fe47",
66
- "patchy-cli-darwin-arm64": "0.0.4-pr.154.bd0fe47",
67
- "patchy-cli-windows-x64": "0.0.4-pr.154.bd0fe47"
63
+ "patchy-cli-linux-x64": "0.0.4-pr.155.1bfd263",
64
+ "patchy-cli-linux-arm64": "0.0.4-pr.155.1bfd263",
65
+ "patchy-cli-darwin-x64": "0.0.4-pr.155.1bfd263",
66
+ "patchy-cli-darwin-arm64": "0.0.4-pr.155.1bfd263",
67
+ "patchy-cli-windows-x64": "0.0.4-pr.155.1bfd263"
68
68
  },
69
69
  "publishConfig": {
70
70
  "access": "public"