diff options
Diffstat (limited to '.gitconfig')
-rw-r--r-- | .gitconfig | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -37,6 +37,7 @@ ap = add -p up = pull --rebase=preserve fa = fetch --all --verbose + fap = fetch --all --prune --verbose gr = grep --break --heading --line-number d = diff ds = diff --stat @@ -58,6 +59,13 @@ smam = submodule add -b master smir = submodule update --init --recursive smu = submodule foreach git pull + bl = branch --list + br = branch -r + 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' -" + cps = cherry-pick -S [push] default = simple [pretty] @@ -65,6 +73,7 @@ [core] editor = vim fileMode = true + hooksPath = ~/git-hooks [merge] tool = vimdiff [mergetool] @@ -80,3 +89,9 @@ #proxy = http://10.0.0.1:3128/ [pull] rebase = false +[pack] + windowMemory = 1024m +[credential] + helper = !type pass-git-helper > /dev/null && pass-git-helper $@ + useHttpPath = true + |