mathieu/config
1
1
Fork 0
Code Issues Pull Requests Releases Activity

git: add rank alias

Browse Source
This commit is contained in:
Mathieu Maret 2023-01-24 16:16:09 +01:00
parent 726cb99414
commit 54fd28a37e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitconfig
View File

@ -40,6 +40,7 @@
cleanbr = remote prune origin cleanbr = remote prune origin
cleanbrshow = remote prune origin --dry-run cleanbrshow = remote prune origin --dry-run
cleanupbr = "!git branch --merged | grep -v '\\*\\|master\\|develop\\|dev' | xargs -n 1 git branch -d" cleanupbr = "!git branch --merged | grep -v '\\*\\|master\\|develop\\|dev' | xargs -n 1 git branch -d"
# Remove local branch that have been removed on the server
cleanupbrprune = "!git fetch --prune" cleanupbrprune = "!git fetch --prune"
contains = !sh -c 'git branch -a --contains $1' - contains = !sh -c 'git branch -a --contains $1' -
wdiff = diff --word-diff=color --unified=1 wdiff = diff --word-diff=color --unified=1
@ -68,6 +69,7 @@
ri = "rebase -i --autostash --autosquash" ri = "rebase -i --autostash --autosquash"
up = pull --rebase --autostash up = pull --rebase --autostash
rebaseour = "rebase -Xours" rebaseour = "rebase -Xours"
rank = "shortlog -s -n --no-merges"
[rebase] [rebase]
# when rebasing, update the other common branch too. # when rebasing, update the other common branch too.
# See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/ # See https://andrewlock.net/working-with-stacked-branches-in-git-is-easier-with-update-refs/