janek
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config/git: Update aliases and add new ones for add, stash, rebase

This commit is contained in:
xerus2000 2020-10-12 22:15:35 +02:00
parent 5031a56bd1
commit 0986fa0d73
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.config/git/config
View File

@ -54,6 +54,10 @@
stv = --paginate status -v stv = --paginate status -v
stvv = --paginate status -vv stvv = --paginate status -vv
sta = stash
stp = stash pop
std = stash drop
r = remote -v r = remote -v
b = branch -vv b = branch -vv
ref = reflog ref = reflog
@ -62,21 +66,26 @@
root = rev-parse --show-toplevel root = rev-parse --show-toplevel
curbranch = symbolic-ref --short HEAD curbranch = symbolic-ref --short HEAD
lo = log --pretty=tformat:'%C(auto)%h -%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges l = pull
l = !git --no-pager lo -5 lg = log --pretty=tformat:'%C(auto)%h -%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges
my = lo --author erus ln = !git --no-pager lg -5
standup = lo --since yesterday --author erus --all my = lg --author erus
standup = lg --since yesterday --author erus --all
co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++' co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++'
# List all branches with their last updates when = git for-each-ref --sort=committerdate --format='%(refname:short) * %(authorname) * %(committerdate:relative)' refs/remotes/ # List all branches with their last updates
when = git for-each-ref --sort=committerdate --format='%(refname:short) * %(authorname) * %(committerdate:relative)' refs/remotes/
dir = !git root | sed 's/$/\\/.git/' | grep --color=never "/" # grep ensures a proper exit status on fail dir = !git root | sed 's/$/\\/.git/' | grep --color=never "/" # grep ensures a proper exit status on fail
upstream = !git rev-parse --abbrev-ref --symbolic-full-name @{u} || echo origin/$(git curbranch) upstream = !git rev-parse --abbrev-ref --symbolic-full-name @{u} || echo origin/$(git curbranch)
a = add -u
aa = add -u .
ap = add -p ap = add -p
c = commit -v c = commit -v
co = checkout co = checkout
cb = checkout -b
cp = cherry-pick cp = cherry-pick
rb = rebase
rbc = rebase --continue
p = push p = push
pf = push --force-with-lease pf = push --force-with-lease
fs = !git fetch && git st fs = !git fetch && git st
@ -84,8 +93,8 @@
luu = !git pull upstream $(git curbranch) && git push --no-verify luu = !git pull upstream $(git curbranch) && git push --no-verify
rh = reset HEAD~ rh = reset HEAD~
rhh = reset --hard rs = reset --keep
rhhu = !git reset --hard $(git upstream) ru = reset --keep @{u}
unstage = reset HEAD -- unstage = reset HEAD --
gcr = !git gc && git repack -a -d gcr = !git gc && git repack -a -d