tmont/settings
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more meld merge settings, fixed releases alias

Browse Source
This commit is contained in:
tmont 2023-04-23 19:32:04 -07:00
parent bdc22c8ac2
commit c675f4cb88
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitconfig
View File

@ -2,7 +2,7 @@
lg = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr)%Creset %C(bold blue)%an%Creset%C(yellow)%d%Creset %s' --abbrev-commit lg = log --color --graph --pretty=format:'%Cred%h%Creset %Cgreen(%cr)%Creset %C(bold blue)%an%Creset%C(yellow)%d%Creset %s' --abbrev-commit
old-branches = for-each-ref refs/remotes/origin/ --sort=committerdate --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:blue)%(authorname)%(color:reset) (%(color:green)%(committerdate:relative)%(color:reset))' old-branches = for-each-ref refs/remotes/origin/ --sort=committerdate --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) %(color:blue)%(authorname)%(color:reset) (%(color:green)%(committerdate:relative)%(color:reset))'
release-count = !git releases | cut -f 3 | sort | uniq -c | sort -n -r release-count = !git releases | cut -f 3 | sort | uniq -c | sort -n -r
releases = !git log --date=local --decorate=full --all --pretty=format:'%Cgreen%ai%Creset\t%Cred%h%Creset\t%Cblue%cn%Creset\t%d\t%s' --abbrev-commit | grep -E 'release:? v?[0-9]+\\.[0-9]+\\.[0-9]+(:| -)' | perl -p -e 's%\\(.*?tag: .+?\\)\\s*release(:\\s*)?%%' | sort -i releases = !git log --date=local --decorate=full --all --pretty=format:'%Cgreen%ai%Creset\t%Cred%h%Creset\t%Cblue%cn%Creset\t%d\t%s' --abbrev-commit | grep -E 'release:? v?[0-9]+\\.[0-9]+\\.[0-9]+' | perl -p -e 's%\\(.*?tag: .+?\\)\\s*release(:\\s*)?%%' | sort -i
stat = status -sb stat = status -sb
tags = !git log --decorate=full --all --pretty=format:'%ai %d %s' --abbrev-commit | grep 'refs/tags' | sed -E 's/\\(tag:.+\\)[[:space:]]//' tags = !git log --decorate=full --all --pretty=format:'%ai %d %s' --abbrev-commit | grep 'refs/tags' | sed -E 's/\\(tag:.+\\)[[:space:]]//'
[color] [color]
@ -25,8 +25,11 @@
[push] [push]
default = upstream default = upstream
[merge] [merge]
tool = meld hideResolved = true
tool = meld --auto-merge --output="$MERGED" "$LOCAL" "$BASE" "$REMOTE"
[mergetool] [mergetool]
keepBackup = false keepBackup = false
[core] [core]
pager = diff-so-fancy | less -x4 -RFX pager = diff-so-fancy | less -x4 -RFX
#[diff]
# external = difft --display=inline --tab-width=4