barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

update portia settings

Browse source
This commit is contained in:
Barak Michener 2020-03-03 12:38:08 -08:00
parent f24aa9b6ea
commit 6e4516de0e
6 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitconfig
View file

@ -16,10 +16,12 @@
ours = "!f() { git checkout --ours $@ && git add $@; }; f"
theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
praise = blame
blame = "gblame"
; blame = "gblame"
reabsorb = rebase -i --autosquash
flog = "!f() { git ls-tree -r --full-name HEAD | awk '{print $4}' | xargs -i sh -c 'echo $(git log --oneline {} | wc -l) {}'; }; f"
fileprimary = "!f() { git blame --line-porcelain $@ | grep \"author \" | cut -d \" \" -f 2- | sort | uniq -c | sort -n | tail -n 1 | sed -e 's/\\s\\+[0-9]\\+ //g'; }; f"
newbranch = "!f() { git fetch origin && git checkout origin/master && git checkout -b $@; }; f"
nb = newbranch
[diff]
renamelimit = 0