Skip to content

Commit 266c376

Browse files
georgetticaNoah Gorny
georgettica
authored and
Noah Gorny
committed
refactor(aliases): sort
- move all comments to the same line so they wont be jumbled
1 parent cc3bdc2 commit 266c376

File tree

1 file changed

+88
-104
lines changed

1 file changed

+88
-104
lines changed

‎aliases/available/git.aliases.bash

+88-104
Original file line numberDiff line numberDiff line change
@@ -2,131 +2,115 @@ cite 'about-alias'
22
about-alias 'common git abbreviations'
33

44
# Aliases
5-
alias gcl='git clone'
5+
alias g='git'
66
alias ga='git add'
7-
alias grm='git rm'
8-
alias gap='git add -p'
97
alias gall='git add -A'
8+
alias gap='git add -p'
9+
alias gb='git branch'
10+
alias gbD='git branch -D'
11+
alias gba='git branch -a'
12+
alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC' # FROM https://stackoverflow.com/a/58623139/10362396
13+
alias gbd='git branch -d'
14+
alias gbm='git branch -m'
15+
alias gbt='git branch --track'
16+
alias gc='git commit -v'
17+
alias gca='git commit -v -a'
18+
alias gcaa='git commit -a --amend -C HEAD' # Add uncommitted and unstaged changes to the last commit
19+
alias gcam='git commit -v -am'
20+
alias gcamd='git commit --amend'
21+
alias gcb='git checkout -b'
22+
alias gci='git commit --interactive'
23+
alias gcl='git clone'
24+
alias gclean='git clean -fd'
25+
alias gcm='git commit -v -m'
26+
alias gco='git checkout'
27+
alias gcob='git checkout -b'
28+
alias gcobu='git checkout -b ${USER}/'
29+
alias gcom='git checkout master'
30+
alias gcount='git shortlog -sn'
31+
alias gcp='git cherry-pick'
32+
alias gcpd='git checkout master; git pull; git branch -D'
33+
alias gcpx='git cherry-pick -x'
34+
alias gcsam='git commit -S -am'
35+
alias gct='git checkout --track'
36+
alias gd='git diff'
37+
alias gdel='git branch -D'
38+
alias gds='git diff --staged'
39+
alias gdt='git difftool'
40+
alias gdv='git diff -w "$@" | vim -R -'
41+
alias get='git'
42+
alias gexport='git archive --format zip --output'
1043
alias gf='git fetch --all --prune'
1144
alias gft='git fetch --all --prune --tags'
12-
alias gfv='git fetch --all --prune --verbose'
1345
alias gftv='git fetch --all --prune --tags --verbose'
14-
alias gus='git reset HEAD'
15-
alias gpristine='git reset --hard && git clean -dfx'
16-
alias gclean='git clean -fd'
17-
alias gm="git merge"
18-
alias gmv='git mv'
19-
alias g='git'
20-
alias get='git'
21-
alias gs='git status'
22-
alias gss='git status -s'
23-
alias gsu='git submodule update --init --recursive'
46+
alias gfv='git fetch --all --prune --verbose'
47+
alias gg='git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative'
48+
alias ggf='git log --graph --date=short --pretty=format:'%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s''
49+
alias ggs='gg --stat'
50+
alias ggui='git gui'
51+
alias ghm='cd '$(git rev-parse --show-toplevel)'' # Git home
2452
alias gl='git pull'
25-
alias gpl='git pull'
53+
alias gll='git log --graph --pretty=oneline --abbrev-commit'
2654
alias glum='git pull upstream master'
27-
alias gpr='git pull --rebase'
28-
alias gpp='git pull && git push'
29-
alias gup='git fetch && git rebase'
55+
alias gm='git merge'
56+
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
57+
alias gmv='git mv'
58+
alias gnew='git log HEAD@{1}..HEAD@{0}' # From http://blogs.atlassian.com/2014/10/advanced-git-aliases/ # Show commits since last pull
3059
alias gp='git push'
60+
alias gpatch='git format-patch -1'
3161
alias gpd='git push --delete'
62+
alias gpf='git push --force'
63+
alias gpl='git pull'
3264
alias gpo='git push origin HEAD'
65+
alias gpom='git push origin master'
66+
alias gpp='git pull && git push'
67+
alias gpr='git pull --rebase'
68+
alias gpristine='git reset --hard && git clean -dfx'
69+
alias gprom='git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master' # Rebase with latest remote master
3370
alias gpu='git push --set-upstream'
71+
alias gpunch='git push --force-with-lease'
3472
alias gpuo='git push --set-upstream origin'
3573
alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
36-
alias gpom='git push origin master'
3774
alias gr='git remote'
38-
alias grv='git remote -v'
3975
alias gra='git remote add'
4076
alias grb='git rebase'
4177
alias grm='git rebase master'
78+
alias grm='git rm'
4279
alias grmi='git rebase master -i'
43-
alias gd='git diff'
44-
alias gds='git diff --staged'
45-
alias gdt='git difftool'
46-
alias gdv='git diff -w "$@" | vim -R -'
47-
alias gc='git commit -v'
48-
alias gca='git commit -v -a'
49-
alias gcm='git commit -v -m'
50-
alias gcam="git commit -v -am"
51-
alias gci='git commit --interactive'
52-
alias gcamd='git commit --amend'
53-
alias gb='git branch'
54-
alias gba='git branch -a'
55-
# FROM https://stackoverflow.com/a/58623139/10362396
56-
alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC'
57-
alias gbt='git branch --track'
58-
alias gbm='git branch -m'
59-
alias gbd='git branch -d'
60-
alias gbD='git branch -D'
61-
alias gcount='git shortlog -sn'
62-
alias gcp='git cherry-pick'
63-
alias gcpx='git cherry-pick -x'
64-
alias gco='git checkout'
65-
alias gcom='git checkout master'
66-
alias gcb='git checkout -b'
67-
alias gcob='git checkout -b'
68-
alias gcobu='git checkout -b ${USER}/'
69-
alias gct='git checkout --track'
70-
alias gcpd='git checkout master; git pull; git branch -D'
71-
alias gexport='git archive --format zip --output'
72-
alias gdel='git branch -D'
73-
alias gmu='git fetch origin -v; git fetch upstream -v; git merge upstream/master'
74-
alias gll='git log --graph --pretty=oneline --abbrev-commit'
75-
alias gg="git log --graph --pretty=format:'%C(bold)%h%Creset%C(magenta)%d%Creset %s %C(yellow)<%an> %C(cyan)(%cr)%Creset' --abbrev-commit --date=relative"
76-
alias ggf="git log --graph --date=short --pretty=format:'%C(auto)%h %Cgreen%an%Creset %Cblue%cd%Creset %C(auto)%d %s'"
77-
alias ggs="gg --stat"
78-
alias gsh="git show"
79-
alias gsl="git shortlog -sn"
80-
alias gwc="git whatchanged"
81-
alias gt="git tag"
82-
alias gta="git tag -a"
83-
alias gtd="git tag -d"
84-
alias gtl="git tag -l"
85-
alias gpatch="git format-patch -1"
86-
# From http://blogs.atlassian.com/2014/10/advanced-git-aliases/
87-
# Show commits since last pull
88-
alias gnew="git log HEAD@{1}..HEAD@{0}"
89-
# Add uncommitted and unstaged changes to the last commit
90-
alias gcaa="git commit -a --amend -C HEAD"
91-
# Rebase with latest remote master
92-
alias gprom="git fetch origin master && git rebase origin/master && git update-ref refs/heads/master origin/master"
93-
alias gpf="git push --force"
94-
alias gpunch="git push --force-with-lease"
95-
alias ggui="git gui"
96-
alias gcsam="git commit -S -am"
97-
# Stash aliases
98-
alias gst="git stash"
99-
alias gstb="git stash branch"
100-
alias gstd="git stash drop"
101-
alias gstl="git stash list"
102-
# Push introduced in git v2.13.2
103-
alias gstpu="git stash push"
104-
alias gstpum="git stash push -m"
105-
# Save deprecated since git v2.16.0
106-
# - aliases now resolve to push
107-
alias gsts="git stash push"
108-
alias gstsm="git stash push -m"
109-
# Alias gstpo added for symmetry with gstpu (push)
110-
# - gstp remains as alias for pop due to long-standing usage
111-
alias gstpo="git stash pop"
112-
alias gstp="git stash pop"
113-
# Switch aliases - Requires git v2.23+
114-
alias gsw="git switch"
115-
alias gswm="git switch master"
116-
alias gswc="git switch --create"
117-
alias gswt="git switch --track"
118-
# Git home
119-
alias ghm='cd "$(git rev-parse --show-toplevel)"'
80+
alias grv='git remote -v'
81+
alias gs='git status'
82+
alias gsd='git svn dcommit'
83+
alias gsh='git show'
84+
alias gsl='git shortlog -sn'
85+
alias gsr='git svn rebase' # Git SVN
86+
alias gss='git status -s'
87+
alias gst='git stash' # Stash aliases
88+
alias gstb='git stash branch'
89+
alias gstd='git stash drop'
90+
alias gstl='git stash list'
91+
alias gstp='git stash pop'
92+
alias gstpo='git stash pop' # Alias gstpo added for symmetry with gstpu (push) # - gstp remains as alias for pop due to long-standing usage
93+
alias gstpu='git stash push' # Push introduced in git v2.13.2
94+
alias gstpum='git stash push -m'
95+
alias gsts='git stash push' # Save deprecated since git v2.16.0 # - aliases now resolve to push
96+
alias gstsm='git stash push -m'
97+
alias gsu='git submodule update --init --recursive'
98+
alias gsw='git switch' # Switch aliases - Requires git v2.23+
99+
alias gswc='git switch --create'
100+
alias gswm='git switch master'
101+
alias gswt='git switch --track'
102+
alias gt='git tag'
103+
alias gta='git tag -a'
104+
alias gtd='git tag -d'
105+
alias gtl='git tag -l'
106+
alias gu='git ls-files . --exclude-standard --others' # Show untracked files
107+
alias gup='git fetch && git rebase'
108+
alias gus='git reset HEAD'
109+
alias gwc='git whatchanged'
110+
120111
if ! _command_exists gh; then
121112
alias gh='ghm'
122113
fi
123-
# Show untracked files
124-
alias gu='git ls-files . --exclude-standard --others'
125-
126-
# Git SVN
127-
alias gsr='git svn rebase'
128-
alias gsd='git svn dcommit'
129-
130114
case $OSTYPE in
131115
darwin*)
132116
alias gtls="git tag -l | gsort -V"

0 commit comments

Comments
 (0)