diff options
Diffstat (limited to '.config/git/config')
| -rw-r--r-- | .config/git/config | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/.config/git/config b/.config/git/config index 453b799..83d0dec 100644 --- a/.config/git/config +++ b/.config/git/config @@ -10,8 +10,39 @@ default = nothing [merge "merge-changelog"] name = GNU-style ChangeLog merge driver - driver =git-merge-changelog %O %A %B + driver = git-merge-changelog %O %A %B [alias] + # Things I use all the time + mergek = !gitk HEAD MERGE_HEAD ^$(git merge-base HEAD MERGE_HEAD) + k = !gitk + ref = show --format=reference --no-patch + git = !git + # Things I don't use because I forgot I have them lg = log --graph --format='%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative hist = log --format='%h %ci -%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit graphviz = "!f() { echo 'digraph git {' ; git log --pretty='format: %h -> { %p }' \"$@\" | sed 's/[0-9a-f][0-9a-f]*/\"&\"/g' ; echo '}'; }; f" + apply-gitignore = "!git ls-files --cached --ignored --exclude-standard -z | xargs -r -0 git rm --cached" +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true +[gui] + fontui = -family monospace -size 9 -weight normal -slant roman -underline 0 -overstrike 0 + fontdiff = -family monospace -size 9 -weight normal -slant roman -underline 0 -overstrike 0 +[versionsort] + suffix = - +[tag] + sort = version:refname +[rerere] + enabled = false +[url "git+ssh://lukeshu@git.launchpad.net/"] + insteadof = lp: +[url "git@github.com:datawire/aes-ratelimit"] + insteadOf = https://github.com/datawire/aes-ratelimit +[url "git@github.com:datawire/apro"] + insteadOf = https://github.com/datawire/apro +[url "git@github.com:datawire/telepresence2-proprietary"] + insteadOf = https://github.com/datawire/telepresence2-proprietary +[url "git@github.com:datawire/telepresence-pro"] + insteadOf = https://github.com/datawire/telepresence-pro |