@kaynooo/cli-git 0.16.1 → 0.17.3
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.
- package/README.md +4 -4
- package/dist/gb.js +1728 -1143
- package/dist/gc.js +1173 -178
- package/dist/gcl.js +1165 -181
- package/dist/gd.js +1152 -183
- package/dist/gf.js +1172 -182
- package/dist/gm.js +1799 -1172
- package/dist/gp.js +1153 -181
- package/dist/gst.js +1149 -185
- package/dist/gu.js +1152 -178
- package/package.json +5 -5
package/README.md
CHANGED
|
@@ -53,11 +53,11 @@ Prints one line with the branch, its upstream and how far ahead and behind it is
|
|
|
53
53
|
|
|
54
54
|
## gm
|
|
55
55
|
|
|
56
|
-
`gm <branch>` merges the branch into the current one with `git merge --no-edit` and prints what came in: fast-forward or merge commit, the commits and the files changed.
|
|
56
|
+
`gm <branch>` merges the branch into the current one with `git merge --no-edit` and prints what came in: fast-forward or merge commit, the commits and the files changed. Staged changes are refused, and so are unstaged ones in files the merge changes; other unstaged edits stay as they are, through a conflict and gm --abort too.
|
|
57
57
|
|
|
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.
|
|
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` stages the conflicted files and commits once the markers are gone, refusing while one remains or while a file git could not mark (binary, deleted on one side, `merge=binary`) is still not added or removed, 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
|
|
|
@@ -73,7 +73,7 @@ Prints one line with the branch, its upstream and how far ahead and behind it is
|
|
|
73
73
|
`gd [path]...` lists the tracked files that changed with their added and removed lines, staged apart from unstaged; untracked files are `gst`'s. With paths, or `--patch` (`-p`), it prints the patch instead, through `view --diff` on a terminal when `view` is installed.
|
|
74
74
|
|
|
75
75
|
- `--staged` (`-s`) keeps what is staged; `--ref <rev>` compares the working tree to a commit, branch or tag, and `--ref a..b` two commits.
|
|
76
|
-
- `--json` prints `[{title, files: [{path, added, removed}]}]`, the counts being null for a binary file.
|
|
76
|
+
- `--json` prints `[{title, files: [{path, added, removed}], patch?}]`, the counts being null for a binary file; with paths or `--patch` each section also holds its patch, its files narrowed to the paths.
|
|
77
77
|
- Exit codes: 0, 1 git refused (an unknown ref), 2 outside a repository or a usage error.
|
|
78
78
|
|
|
79
79
|
## gu
|