@kaynooo/cli-git 0.17.0 → 0.17.2

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 (11) hide show
  1. package/README.md +1 -1
  2. package/dist/gb.js +1674 -1141
  3. package/dist/gc.js +1089 -159
  4. package/dist/gcl.js +1124 -174
  5. package/dist/gd.js +1100 -170
  6. package/dist/gf.js +1131 -175
  7. package/dist/gm.js +1686 -1155
  8. package/dist/gp.js +1110 -174
  9. package/dist/gst.js +1108 -178
  10. package/dist/gu.js +1097 -167
  11. package/package.json +2 -2
package/README.md CHANGED
@@ -57,7 +57,7 @@ Prints one line with the branch, its upstream and how far ahead and behind it is
57
57
 
58
58
  - On a conflict every conflicted file is listed with its conflict regions (the markers and two lines around them, line numbers included) and the exit is 1; `gm --continue` commits once the markers are gone, refusing while one remains, and `gm --abort` gives the merge up.
59
59
  - `gm --dry-run <branch>` says whether the merge would conflict, and in which files, with `git merge-tree` and nothing touched.
60
- - `--squash` stages the branch's changes without committing them, to commit with `gc`.
60
+ - `--squash` stages the branch's changes without committing them or recording a merge, to commit with `gc`; a conflict then leaves the files to resolve and `git reset --merge` gives up.
61
61
  - With no branch, a terminal gets a picker of the other branches (ahead and behind the current one, a preview of the commits, files and verdict; enter merges, ctrl-s squashes); without a terminal the branches are listed with their verdict, `--json` giving `[{name, ahead, behind, outcome, conflicts}]`.
62
62
  - Exit codes: 0 merged, already merged or no conflict in a dry run, 1 a conflict, a dirty tree or a refusal, 2 outside a repository or a usage error.
63
63