diff options
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 42 |
1 files changed, 27 insertions, 15 deletions
@@ -1,3 +1,4 @@ +# vim:syntax=gitconfig:ts=4 [color] diff = auto status = auto @@ -20,6 +21,7 @@ dc = diff --cached lol = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit lola = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit --all + logadog = log --all --decorate --oneline --graph lf = log --graph --decorate --pretty=ln-long ls = ls-files compactlog = log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short @@ -64,34 +66,44 @@ 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 +[tag] + 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 |