git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authormail_redacted_for_web 2025-06-25 08:33:58 +0200
committermail_redacted_for_web 2025-06-25 08:33:58 +0200
commitce1ffd1b78995851b3f282fb541b04d0fa08390c (patch)
tree82a9e981239b2d2e013d2e805f9e1cfd003a3267 /.gitconfig
parent2460caab79714e5d4a94a6498323db208ce89206 (diff)
downloaddotfiles-ce1ffd1b78995851b3f282fb541b04d0fa08390c.tar.bz2
.gitconfig: set core.abbrev to 4, set equal sign (=) indentations
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig32
1 files changed, 17 insertions, 15 deletions
diff --git a/.gitconfig b/.gitconfig
index 8498e16..81a2cc6 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,3 +1,4 @@
+# vim:syntax=gitconfig:ts=4
[color]
diff = auto
status = auto
@@ -65,41 +66,42 @@
rhh = reset --hard HEAD
sl = shortlog -s
sls = "!git shortlog -s | cut -f1 | spark"
- gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"
+ gl-mr = "!sh -c 'git fetch $1 merge-requests/$2/head:mr-$1-$2 && git checkout mr-$1-$2' -"
cps = cherry-pick -S
force = push --force-with-lease
pf = push --force-with-lease
[push]
- default = simple
+ default = simple
[pretty]
- ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers)
+ ln-long = format:%C(auto)%H %gD %d %nAuthor: %aN <%aE>%n%C(auto)GPG signature: %G? %GF (%GT)%nGPG Primary Key: %GP%nDate: %ad %nSubject: %s %+b %+N %+(trailers)
[core]
- editor = vim
- fileMode = true
- hooksPath = ~/git-hooks
+ editor = vim
+ fileMode = true
+ hooksPath = ~/git-hooks
+ abbrev = 4
[merge]
- tool = vimdiff
+ tool = vimdiff
[mergetool]
- keepBackup = false
+ keepBackup = false
[gui]
- fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
- fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+ fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
+ fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0
[commit]
- gpgsign = false
+ gpgsign = false
#[gpg]
# program = /usr/bin/gpg2
[http]
#proxy = http://10.0.0.1:3128/
[pull]
- rebase = false
+ rebase = false
[pack]
windowMemory = 1024m
[credential]
- helper = !type pass-git-helper > /dev/null && pass-git-helper $@
- useHttpPath = true
+ helper = !type pass-git-helper > /dev/null && pass-git-helper $@
+ useHttpPath = true
[init]
# we don't adhere to extremists trying to alter language, this was a bad idea pre-1990 and it still is.
# this term was not meant racially or sexually abusive, so the convention remains.
defaultBranch = master
[safe]
- directory = /opt/puppetlabs/pdk/share/cache/pdk-templates.git
+ directory = /opt/puppetlabs/pdk/share/cache/pdk-templates.git