6dc6646d529a7dc6a1d8e1a2c1507dff7e528c8d
- Author
- Romain Janvier <hello@romainjanvier.com>
- Committer
- Carlo Sala <carlosalag@protonmail.com>
- Date
Message
docs(git): add missing entries and run formatter
Diff
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 8cb4215a942de0f5eda615154fd427be799a7cff..d455e0eff8d1800f3b8668bac7527d6e10f8d967 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -60,6 +60,8 @@ plugins=(... git)
6 | gcpa | git cherry-pick --abort |
7 | gcpc | git cherry-pick --continue |
8 | gcs | git commit -S |
9+| gcss | git commit -S -s |
10+| gcssm | git commit -S -s -m |
11 | gd | git diff |
12 | gdca | git diff --cached |
13 | gdcw | git diff --cached --word-diff |
14@@ -157,8 +159,8 @@ plugins=(... git)
15 | gsr | git svn rebase |
16 | gss | git status --short |
17 | gst | git status |
18-| gsta | git stash push |
19-| gsta | git stash save |
20+| gsta | git stash push (git version >= 2.13) |
21+| gsta | git stash save (git version < 2.13) |
22 | gstaa | git stash apply |
23 | gstc | git stash clear |
24 | gstd | git stash drop |
25@@ -176,7 +178,7 @@ plugins=(... git)
26 | gtv | git tag \| sort -V |
27 | gtl | gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl |
28 | gunignore | git update-index --no-assume-unchanged |
29-| gunwip | git log --max-count=1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1 |
30+| gunwip | git log --max-count=1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1 |
31 | gup | git pull --rebase |
32 | gupv | git pull --rebase --verbose |
33 | gupa | git pull --rebase --autostash |
34@@ -192,10 +194,10 @@ plugins=(... git)
35 | gams | git am --skip |
36 | gama | git am --abort |
37 | gamscp | git am --show-current-patch |
38-| gwt | git worktree |
39-| gwtls | git worktree list |
40-| gwtmv | git worktree move |
41-| gwtrm | git worktree remove |
42+| gwt | git worktree |
43+| gwtls | git worktree list |
44+| gwtmv | git worktree move |
45+| gwtrm | git worktree remove |
46
47 ### Main branch preference
48
49@@ -227,7 +229,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
50 ### Current
51
52 | Command | Description |
53-|:-----------------------|:---------------------------------------------------------------------------------------------------------|
54+| :--------------------- | :------------------------------------------------------------------------------------------------------- |
55 | `grename <old> <new>` | Rename `old` branch to `new`, including in origin remote |
56 | current_branch | Return the name of the current branch |
57 | git_current_user_name | Returns the `user.name` config value |
58@@ -240,13 +242,13 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
59 These features allow to pause a branch development and switch to another one (_"Work in Progress"_, or wip). When you want to go back to work, just unwip it.
60
61 | Command | Description |
62-|:-----------------|:------------------------------------------------|
63+| :--------------- | :---------------------------------------------- |
64 | work_in_progress | Echoes a warning if the current branch is a wip |
65 | gwip | Commit wip branch |
66 | gunwip | Uncommit wip branch |
67
68 ### Deprecated functions
69
70-| Command | Description | Reason |
71-|:-----------------------|:----------------------------------------|:----------------------------------------------------------------|
72-| current_repository | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |
73+| Command | Description | Reason |
74+| :----------------- | :-------------------------------------- | :-------------------------------------------------------------- |
75+| current_repository | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |