m/dotfiles
1
0
Fork 0
mirror of https://github.com/kremalicious/dotfiles.git synced 2024-11-22 01:37:14 +01:00
Code Releases Activity

gitconfig updates

Browse Source
This commit is contained in:
Matthias Kretschmann 2020-11-02 23:31:41 +01:00
parent 6a3b65e69f
commit a23d4e6265
Signed by: m
GPG Key ID: 606EEEF3C479A91F
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gitconfig
View File

@ -50,7 +50,8 @@
# Remove branches that have already been merged with master # Remove branches that have already been merged with master
# a.k.a. ‘delete merged’ # a.k.a. ‘delete merged’
dm = "!git branch --merged master | grep -v '\\* master' | xargs -n 1 git branch -d" dm = "!git branch --merged main | grep -v '\\* main' | xargs -n 1 git branch -d"
dma = "!git branch --merged master | grep -v '\\* master' | xargs -n 1 git branch -d"
uncommit = reset --soft HEAD^ uncommit = reset --soft HEAD^
unstage = reset HEAD unstage = reset HEAD
@ -88,3 +89,7 @@
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
[pull]
rebase = false
[gpg]
program = /usr/local/bin/gpg