35454190f6aeae9b9f16acdbdd0cf72c32610ee8
- Author
- Jack DeVries <jdevries3133@gmail.com>
- Committer
- Carlo Sala <carlosalag@protonmail.com>
- Date
Message
feat(git): use verbose flags in aliases Closes #11244 Closes #11246 Closes #10101 Closes #11380
Diff
This diff is truncated to protect this page.
1diff --git a/plugins/git/README.md b/plugins/git/README.md
2index 3beb0890abcbc310ae94a1c86e1f33bc72b9e770..8cb4215a942de0f5eda615154fd427be799a7cff 100644
3--- a/plugins/git/README.md
4+++ b/plugins/git/README.md
5@@ -10,191 +10,189 @@ plugins=(... git)
6
7 ## Aliases
8
9-| Alias | Command |
10-|:---------------------|:---------------------------------------------------------------------------------------------------------------------------------|
11-| g | git |
12-| ga | git add |
13-| gaa | git add --all |
14-| gapa | git add --patch |
15-| gau | git add --update |
16-| gav | git add --verbose |
17-| gap | git apply |
18-| gapt | git apply --3way |
19-| gb | git branch |
20-| gba | git branch -a |
21-| gbd | git branch -d |
22-| gbda | git branch --no-color --merged \| grep -vE "^([+*]\|\s*(<span>$</span>(git_main_branch)\|<span>$</span>(git_develop_branch))\s*<span>$</span>)" \| xargs git branch -d 2>/dev/null |
23-| gbD | git branch -D |
24-| gbl | git blame -b -w |
25-| gbnm | git branch --no-merged |
26-| gbr | git branch --remote |
27-| gbs | git bisect |
28-| gbsb | git bisect bad |
29-| gbsg | git bisect good |
30-| gbsr | git bisect reset |
31-| gbss | git bisect start |
32-| gc | git commit -v |
33-| gc! | git commit -v --amend |
34-| gcn | git commit -v --no-edit |
35-| gcn! | git commit -v --no-edit --amend |
36-| gca | git commit -v -a |
37-| gca! | git commit -v -a --amend |
38-| gcan! | git commit -v -a --no-edit --amend |
39-| gcans! | git commit -v -a -s --no-edit --amend |
40-| gcam | git commit -a -m |
41-| gcas | git commit -a -s |
42-| gcasm | git commit -a -s -m |
43-| gcsm | git commit -s -m |
44-| gcb | git checkout -b |
45-| gcf | git config --list |
46-| gcl | git clone --recurse-submodules |
47-| gccd | git clone --recurse-submodules "<span>$</span>@" && cd "<span>$</span>(basename <span>$</span>_ .git)" |
48-| gclean | git clean -id |
49-| gpristine | git reset --hard && git clean -dffx |
50-| gcm | git checkout $(git_main_branch) |
51-| gcd | git checkout $(git_develop_branch) |
52-| gcmsg | git commit -m |
53-| gco | git checkout |
54-| gcor | git checkout --recurse-submodules |
55-| gcount | git shortlog -sn |
56-| gcp | git cherry-pick |
57-| gcpa | git cherry-pick --abort |
58-| gcpc | git cherry-pick --continue |
59-| gcs | git commit -S |
60-| gd | git diff |
61-| gdca | git diff --cached |
62-| gdcw | git diff --cached --word-diff |
63-| gdct | git describe --tags $(git rev-list --tags --max-count=1) |
64-| gds | git diff --staged |
65-| gdt | git diff-tree --no-commit-id --name-only -r |
66-| gdnolock | git diff $@ ":(exclude)package-lock.json" ":(exclude)*.lock" |
67-| gdup | git diff @{upstream} |
68-| gdv | git diff -w $@ \| view - |
69-| gdw | git diff --word-diff |
70-| gf | git fetch |
71-| gfa | git fetch --all --prune |
72-| gfg | git ls-files \| grep |
73-| gfo | git fetch origin |
74-| gg | git gui citool |
75-| gga | git gui citool --amend |
76-| ggf | git push --force origin $(current_branch) |
77-| ggfl | git push --force-with-lease origin $(current_branch) |
78-| ggl | git pull origin $(current_branch) |
79-| ggp | git push origin $(current_branch) |
80-| ggpnp | ggl && ggp |
81-| ggpull | git pull origin "$(git_current_branch)" |
82-| ggpur | ggu |
83-| ggpush | git push origin "$(git_current_branch)" |
84-| ggsup | git branch --set-upstream-to=origin/$(git_current_branch) |
85-| ggu | git pull --rebase origin $(current_branch) |
86-| gpsup | git push --set-upstream origin $(git_current_branch) |
87-| ghh | git help |
88-| gignore | git update-index --assume-unchanged |
89-| gignored | git ls-files -v \| grep "^[[:lower:]]" |
90-| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk |
91-| gk | gitk --all --branches &! |
92-| gke | gitk --all $(git log -g --pretty=%h) &! |
93-| gl | git pull |
94-| glg | git log --stat |
95-| glgp | git log --stat -p |
96-| glgg | git log --graph |
97-| glgga | git log --graph --decorate --all |
98-| glgm | git log --graph --max-count=10 |
99-| glo | git log --oneline --decorate |
100-| glol | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' |
101-| glols | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat |
102-| glod | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' |
103-| glods | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short |
104-| glola | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all |
105diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
106index 76e58a12177014df78e1d5a0a525c25c9ad367e3..7544ca4402f518a5a1a500a852a6b7b555c5f03b 100644
107--- a/plugins/git/git.plugin.zsh
108+++ b/plugins/git/git.plugin.zsh
109@@ -69,10 +69,10 @@ alias gap='git apply'
110 alias gapt='git apply --3way'
111
112 alias gb='git branch'
113-alias gba='git branch -a'
114-alias gbd='git branch -d'
115-alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
116-alias gbD='git branch -D'
117+alias gba='git branch --all'
118+alias gbd='git branch --delete'
119+alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null'
120+alias gbD='git branch --delete --force'
121 alias gbl='git blame -b -w'
122 alias gbnm='git branch --no-merged'
123 alias gbr='git branch --remote'
124@@ -82,18 +82,17 @@ alias gbsg='git bisect good'
125 alias gbsr='git bisect reset'
126 alias gbss='git bisect start'
127
128-alias gc='git commit -v'
129-alias gc!='git commit -v --amend'
130-alias gcn='git commit -v --no-edit'
131-alias gcn!='git commit -v --no-edit --amend'
132-alias gca='git commit -v -a'
133-alias gca!='git commit -v -a --amend'
134-alias gcan!='git commit -v -a --no-edit --amend'
135-alias gcans!='git commit -v -a -s --no-edit --amend'
136-alias gcam='git commit -a -m'
137-alias gcsm='git commit -s -m'
138-alias gcas='git commit -a -s'
139-alias gcasm='git commit -a -s -m'
140+alias gc='git commit --verbose'
141+alias gc!='git commit --verbose --amend'
142+alias gcn!='git commit --verbose --no-edit --amend'
143+alias gca='git commit --verbose --all'
144+alias gca!='git commit --verbose --all --amend'
145+alias gcan!='git commit --verbose --all --no-edit --amend'
146+alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
147+alias gcam='git commit --all --message'
148+alias gcsm='git commit --signoff --message'
149+alias gcas='git commit --all --signoff'
150+alias gcasm='git commit --all --signoff --message'
151 alias gcb='git checkout -b'
152 alias gcf='git config --list'
153
154@@ -104,20 +103,20 @@ function gccd() {
155 compdef _git gccd=git-clone
156
157 alias gcl='git clone --recurse-submodules'
158-alias gclean='git clean -id'
159-alias gpristine='git reset --hard && git clean -dffx'
160+alias gclean='git clean --interactive -d'
161+alias gpristine='git reset --hard && git clean --force -dx'
162 alias gcm='git checkout $(git_main_branch)'
163 alias gcd='git checkout $(git_develop_branch)'
164-alias gcmsg='git commit -m'
165+alias gcmsg='git commit --message'
166 alias gco='git checkout'
167 alias gcor='git checkout --recurse-submodules'
168-alias gcount='git shortlog -sn'
169+alias gcount='git shortlog --summary --numbered'
170 alias gcp='git cherry-pick'
171 alias gcpa='git cherry-pick --abort'
172 alias gcpc='git cherry-pick --continue'
173-alias gcs='git commit -S'
174-alias gcss='git commit -S -s'
175-alias gcssm='git commit -S -s -m'
176+alias gcs='git commit --gpg-sign'
177+alias gcss='git commit --gpg-sign --signoff'
178+alias gcssm='git commit --gpg-sign --signoff --message'
179
180 alias gd='git diff'
181 alias gdca='git diff --cached'
182@@ -208,11 +207,11 @@ alias gignored='git ls-files -v | grep "^[[:lower:]]"'
183 alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
184
185 alias gk='\gitk --all --branches &!'
186-alias gke='\gitk --all $(git log -g --pretty=%h) &!'
187+alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
188
189 alias gl='git pull'
190 alias glg='git log --stat'
191-alias glgp='git log --stat -p'
192+alias glgp='git log --stat --patch'
193 alias glgg='git log --graph'
194 alias glgga='git log --graph --decorate --all'
195 alias glgm='git log --graph --max-count=10'
196@@ -240,7 +239,7 @@ alias gpf!='git push --force'
197 alias gpoat='git push origin --all && git push origin --tags'
198 alias gpr='git pull --rebase'
199 alias gpu='git push upstream'
200-alias gpv='git push -v'
201+alias gpv='git push --verbose'
202
203 alias gr='git remote'
204 alias gra='git remote add'
205@@ -248,7 +247,7 @@ alias grb='git rebase'
206 alias grba='git rebase --abort'
207 alias grbc='git rebase --continue'
208 alias grbd='git rebase $(git_develop_branch)'