@kaynooo/cli-git 0.16.1 → 0.17.1

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 +1642 -1139
  3. package/dist/gc.js +1053 -153
  4. package/dist/gcl.js +1086 -166
  5. package/dist/gd.js +1064 -164
  6. package/dist/gf.js +1095 -169
  7. package/dist/gm.js +1667 -1152
  8. package/dist/gp.js +1073 -167
  9. package/dist/gst.js +1072 -172
  10. package/dist/gu.js +1059 -159
  11. package/package.json +5 -5
package/README.md CHANGED
@@ -53,7 +53,7 @@ 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. A working tree with uncommitted changes is refused.
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
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.