dotfiles/git/config

111 lines
2.5 KiB
Text
Raw Normal View History

2024-02-18 12:36:03 +01:00
[alias]
f = flow
ff = flow feature
fr = flow release
b = branch
co = checkout
cm = checkout master
cb = checkout -b
where = branch -r --contains
show = show --show-signature
ci = commit
ciam = "!f() { BRANCH=`git branch --list | grep -E '\\*' | cut -d ' ' -f2`; MSG=\"($BRANCH) $1\"; git ci -am"\"$MSG\""; }; f"
cow = "!f() { git checkout "WE-$1"; }; f"
cbw = "!f() { git cb "WE-$1"; }; f"
amend = commit -a --amend
d = diff
ds = diff --shortstat
ls = log --pretty=format:"%C(yellow)%h%Cgreen%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --no-merges
ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat --no-merges
unstage = reset HEAD --
cp = cherry-pick -s -x
s = status -sb
sl = stash list
sa = stash apply
sp = stash pop
ss = stash save
rba = rebase --abort
rbc = rebase --continue
unpushed = "log --branches --not --remotes --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
# clc = "!f() { git --no-pager ls -1; git --no-pager log --no-merges --pretty=format:'%h' -1 | xclip; }; f"
up = "!gitup"
ns = log staging..master --no-merges --oneline --color --pretty=format:"%C(yellow)%h%Cgreen%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
nr = log deployment..staging --no-merges --oneline --color --pretty=format:"%C(yellow)%h%Cgreen%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
purge-local-branches = "!f() { git cmp; git branch --merged | grep -vE 'master|staging|deployment|\\*' | xargs -n 1 git b -d; git co -;}; f"
appraise = !/bin/git-appraise
[user]
name = Alexander Wühr
signingKey = 0B7107C9393169F4
email = alex@pnyhf.eu
[push]
default = current
[core]
2024-02-22 10:30:07 +01:00
excludesfile = ~/.config/git/ignore
2024-02-18 12:36:03 +01:00
editor = vim
2024-03-05 14:33:30 +01:00
pager = delta
2024-02-18 12:36:03 +01:00
[commit]
2024-02-20 11:08:38 +01:00
verbose = true
2024-02-18 12:36:03 +01:00
gpgSign = true
[tag]
gpgSign = true
2024-05-28 13:26:24 +02:00
[remote]
pushDefault = origin
2024-02-18 12:36:03 +01:00
[init]
defaultBranch = main
2024-05-28 13:26:24 +02:00
2024-02-18 12:36:03 +01:00
[gpg "ssh"]
allowedSignersFile = /home/awuehr/.ssh/allowed_signers
[includeIf "gitdir:~/dev/scn/"]
path = ~/dev/scn/.gitconfig
2024-02-20 11:08:38 +01:00
[fetch]
prune = true
2024-02-21 09:26:55 +01:00
# prunetags = true
2024-02-20 11:08:38 +01:00
fsckobjects = true
2024-05-28 13:26:24 +02:00
all = true
parallel = 0
2024-02-20 11:08:38 +01:00
[merge]
2024-03-05 14:33:30 +01:00
conflictstyle = diff3
2024-02-20 11:08:38 +01:00
[diff]
algorithm = histogram
2024-03-05 14:33:30 +01:00
colorMoved = default
2024-02-20 11:08:38 +01:00
[rerere]
enabled = true
[transfer]
fsckObjects = true
[receive]
fsckObjects = true
2024-03-05 14:33:30 +01:00
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
2024-05-28 13:26:24 +02:00
[help]
2024-05-28 13:57:52 +02:00
autocorrect = 1