Skip to content

O
oh-my-zsh
Unverified Commit 6dc6646d authored by Romain Janvier's avatar Romain Janvier Committed by Carlo Sala
Browse files
Options

docs(git): add missing entries and run formatter

parent 35454190
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
plugins/git/README.md
View file @ 6dc6646d
...@@ -60,6 +60,8 @@ plugins=(... git) ...@@ -60,6 +60,8 @@ plugins=(... git)
| gcpa | git cherry-pick --abort | | gcpa | git cherry-pick --abort |
| gcpc | git cherry-pick --continue | | gcpc | git cherry-pick --continue |
| gcs | git commit -S | | gcs | git commit -S |
| gcss | git commit -S -s |
| gcssm | git commit -S -s -m |
| gd | git diff | | gd | git diff |
| gdca | git diff --cached | | gdca | git diff --cached |
| gdcw | git diff --cached --word-diff | | gdcw | git diff --cached --word-diff |
...@@ -157,8 +159,8 @@ plugins=(... git) ...@@ -157,8 +159,8 @@ plugins=(... git)
| gsr | git svn rebase | | gsr | git svn rebase |
| gss | git status --short | | gss | git status --short |
| gst | git status | | gst | git status |
| gsta | git stash push | | gsta | git stash push (git version >= 2.13) |
| gsta | git stash save | | gsta | git stash save (git version < 2.13) |
| gstaa | git stash apply | | gstaa | git stash apply |
| gstc | git stash clear | | gstc | git stash clear |
| gstd | git stash drop | | gstd | git stash drop |
...@@ -227,7 +229,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa ...@@ -227,7 +229,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
### Current ### Current
| Command | Description | | Command | Description |
|:-----------------------|:---------------------------------------------------------------------------------------------------------| | :--------------------- | :------------------------------------------------------------------------------------------------------- |
| `grename <old> <new>` | Rename `old` branch to `new`, including in origin remote | | `grename <old> <new>` | Rename `old` branch to `new`, including in origin remote |
| current_branch | Return the name of the current branch | | current_branch | Return the name of the current branch |
| git_current_user_name | Returns the `user.name` config value | | git_current_user_name | Returns the `user.name` config value |
...@@ -240,7 +242,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa ...@@ -240,7 +242,7 @@ These are aliases that have been removed, renamed, or otherwise modified in a wa
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. 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.
| Command | Description | | Command | Description |
|:-----------------|:------------------------------------------------| | :--------------- | :---------------------------------------------- |
| work_in_progress | Echoes a warning if the current branch is a wip | | work_in_progress | Echoes a warning if the current branch is a wip |
| gwip | Commit wip branch | | gwip | Commit wip branch |
| gunwip | Uncommit wip branch | | gunwip | Uncommit wip branch |
...@@ -248,5 +250,5 @@ These features allow to pause a branch development and switch to another one (_" ...@@ -248,5 +250,5 @@ These features allow to pause a branch development and switch to another one (_"
### Deprecated functions ### Deprecated functions
| Command | Description | Reason | | Command | Description | Reason |
|:-----------------------|:----------------------------------------|:----------------------------------------------------------------| | :----------------- | :-------------------------------------- | :-------------------------------------------------------------- |
| current_repository | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) | | current_repository | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment