diff options
Diffstat (limited to '.config/git/config.in')
-rw-r--r-- | .config/git/config.in | 132 |
1 files changed, 132 insertions, 0 deletions
diff --git a/.config/git/config.in b/.config/git/config.in new file mode 100644 index 00000000..d2ba8db1 --- /dev/null +++ b/.config/git/config.in @@ -0,0 +1,132 @@ +# -*- mode: conf -*- + +[alias] + s = status + co = checkout + sco = "!f() { git stash && git checkout \"$@\"; git stash pop; }; f" + rco = "!cd \"$(git rev-parse --show-toplevel)\" \ + && git reset && git checkout ." + v = log --graph --full-history -30 --decorate --oneline --all + ov = log --graph --full-history -30 --decorate --oneline --all \ + --simplify-by-decoration + d = diff + cl = clean -xdff + rcl = "!cd \"$(git rev-parse --show-toplevel)\" \ + && git reset && git checkout . && git clean -xdff" + rlh = rl HEAD + +[annex] + # Manually upgrade to new repository layouts once I've confirmed that + # doing so doesn't break any scripts. + autoupgraderepository = false + + # Configure git-annex such that just running 'git annex init' doesn't + # change what 'git add' does. + gitaddtoannex = false + skipunknown = true + +[core] + pager = + hooksPath = ~/src/dotfiles/hooks/git/hooksPath + +[dgit "default"] + clean-mode = git-ff + rm-old-changes = true + distro = debian + push-subcmd = source + rpush-subcmd = built + +[dgit-distro "debian"] + keyid = 8DC2487E51ABDD90B5C4753F0F56D0553B6D411B + upload-host = ssh-upload + +[format] + outputDirectory = SH_HOME/tmp + +# These defaults turn off anonymous recipients to minimise key usage prompts. +[gcrypt] + publish-participants = true + participants = 0F56D0553B6D411B + signingkey = 0F56D0553B6D411B + +[merge] + conflictStyle = zdiff3 + +[merge "dpkg-mergechangelogs"] + name = debian/changelog merge driver + driver = dpkg-mergechangelogs -m %O %A %B %A + +[tar "tar.xz"] + command = xz -c +[tar "tar.gz"] + command = gzip -c + +[transfer] + fsckObjects = true + +[pull] + rebase = true + +[push] + default = upstream + +[rebase] + autoStash = true + +[sendemail] + annotate = true + confirm = always + from = Sean Whitton <spwhitton@spwhitton.name> + +[user] + name = Sean Whitton + email = spwhitton@spwhitton.name + +[url "https://git.spwhitton.name/"] + insteadOf = spw: + insteadOf = git://git.spwhitton.name/ + insteadOf = http://git.spwhitton.name/ + insteadOf = athena: # for compatibility only + insteadOf = demeter: # for compatibility only + insteadOf = git://spwhitton.name/ # for compatibility only +[url "git@git.spwhitton.name:"] + pushInsteadOf = http://git.spwhitton.name/ + pushInsteadOf = https://git.spwhitton.name/ + pushInsteadOf = git://git.spwhitton.name/ + pushInsteadOf = spw: + pushInsteadOf = demeter: # for compatibility only + pushInsteadOf = athena: # for compatibility only + pushInsteadOf = git://spwhitton.name/ # for compatibility only + +[url "https://github.com/"] + insteadOf = github: + insteadOf = git://github.com/ + insteadOf = http://github.com/ +[url "git@github.com:"] + pushInsteadOf = github: + pushInsteadOf = git://github.com/ + pushInsteadOf = http://github.com/ + pushInsteadOf = https://github.com/ + +[url "https://salsa.debian.org/"] + insteadOf = salsa: + insteadOf = http://salsa.debian.org/ +[url "git@salsa.debian.org:"] + pushInsteadOf = salsa: + pushInsteadOf = http://salsa.debian.org/ + pushInsteadOf = https://salsa.debian.org/ + +[url "spwhitton@git.savannah.gnu.org:/srv/git/"] + pushInsteadOf = https://git.savannah.gnu.org/git/ + +[log] + excludeDecoration = refs/remotes/*/HEAD + excludeDecoration = refs/remotes/dgit/ + excludeDecoration = refs/tags/archive/debian/ + +[include] + # Mostly local overrides, e.g. of user.name and user.email. + path = ~/.config/git/local + + # Directory- and repo-specific overrides. + path = ~/src/dotfiles/lib-src/git/includes |