2020-03-08 19:58:52 +01:00
[core]
autocrlf = input
editor = nvim
2021-01-23 19:51:23 +01:00
pager = diffr --colors refine-added:none:background:0x33,0x66,0x33:bold --colors added:none:background:0x33,0x44,0x33 --colors refine-removed:none:background:0x66,0x33,0x33:bold --colors removed:none:background:0x44,0x33,0x33 | less --RAW-CONTROL-CHARS --quit-on-intr
2021-01-11 12:27:55 +01:00
[interactive]
2021-01-23 19:51:23 +01:00
diffFilter = diffr --colors refine-added:none:background:0x33,0x66,0x33:bold --colors added:none:background:0x33,0x44,0x33 --colors refine-removed:none:background:0x66,0x33,0x33:bold --colors removed:none:background:0x44,0x33,0x33
2020-03-31 22:32:43 +02:00
[submodule]
recurse = true
[rerere]
enabled = true
# Accelerate packing by automatically determining thread count
[pack]
threads = 0
2020-09-04 12:15:05 +02:00
[pull]
ff = only
[checkout]
defaultRemote = origin
2020-06-03 12:26:15 +02:00
[diff]
tool = nvim
2021-01-23 19:51:23 +01:00
submodule = log
2020-06-03 12:26:15 +02:00
[merge]
tool = nvim
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
prompt = false
[difftool "nvim"]
2020-11-14 02:05:51 +01:00
cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
2020-06-03 12:26:15 +02:00
2020-03-31 22:32:43 +02:00
# Automatically push to branch with matching name
2020-03-08 19:58:52 +01:00
[push]
default = current
2021-02-13 18:36:56 +01:00
[status]
showStash = true
2020-03-31 22:32:43 +02:00
# Disable pagination for branch commmand by default
2020-03-08 19:58:52 +01:00
[pager]
branch = false
2020-03-31 22:32:43 +02:00
[grep]
2021-02-13 18:36:56 +01:00
lineNumber = true
2021-04-11 22:47:51 +02:00
[log]
date=local
2020-03-31 22:32:43 +02:00
2020-03-08 19:58:52 +01:00
[color "status"]
added = green
changed = yellow
2020-03-31 22:32:43 +02:00
untracked = magenta
[user]
email = 27jf@pm.me
2021-05-02 19:37:18 +02:00
name = xeruf
2020-03-31 22:32:43 +02:00
2020-09-04 12:15:05 +02:00
[mailmap]
file = /home/janek/.config/yadm/.mailmap
[http]
lowSpeedLimit = 1000
lowSpeedTime = 3
2021-01-27 11:26:24 +01:00
[url "ssh://github.com/"]
pushInsteadOf = https://github.com/
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
2020-03-08 19:58:52 +01:00
[alias]
2020-12-12 16:51:14 +01:00
# GET INFO
2021-05-05 08:47:29 +02:00
s = !git stl && git stb
st = stb .
stb = status --short --branch
2020-06-03 12:26:15 +02:00
stv = --paginate status -v
2020-06-03 12:31:25 +02:00
stvv = --paginate status -vv
2020-06-03 12:26:15 +02:00
2020-09-04 12:15:05 +02:00
r = remote -v
b = branch -vv
2020-12-07 21:55:25 +01:00
ba = b -a
2021-02-25 12:25:34 +01:00
main = !cat $(git rev-parse --git-dir)/refs/remotes/origin/HEAD | cut -d'/' -f4
2021-02-18 11:57:44 +01:00
2021-05-05 08:47:29 +02:00
sw = switch
2021-02-18 11:57:44 +01:00
sc = switch -c
2021-02-25 12:25:34 +01:00
sm = !git switch $(git main)
2021-02-13 18:36:56 +01:00
2021-01-07 12:05:18 +01:00
ref = reflog show --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset'
2020-09-04 12:15:05 +02:00
rev = rev-parse --short
head = rev-parse --short HEAD
2020-03-08 19:58:52 +01:00
root = rev-parse --show-toplevel
2020-11-14 02:05:51 +01:00
dir = rev-parse --git-dir
2020-09-04 12:15:05 +02:00
curbranch = symbolic-ref --short HEAD
2020-12-12 16:51:14 +01:00
upstream = !git rev-parse --abbrev-ref --symbolic-full-name @{upstream} || git rev-parse --abbrev-ref --symbolic-full-name @{push} || echo origin/$(git curbranch)
#dir = !git root | sed 's/$/\\/.git/' | grep --color=never "/" # grep ensures a proper exit status on fail
2020-10-23 14:02:54 +02:00
2020-11-14 02:05:51 +01:00
lg = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --graph
lo = log --pretty=tformat:'%C(auto)%h%d %s %Cgreen(%cd) %Cblue<%an>%Creset' --date=human --no-merges
2021-04-11 22:47:51 +02:00
lp = log -p --date=local
2021-05-02 20:36:22 +02:00
ln = !git --no-pager lo "-$(a=$(git rev-list --count HEAD...@{u} 2>/dev/null); test ${a:-0} -gt 4 && expr $a + 3 || echo 7)" --graph HEAD @{u} 2>/dev/null || git --no-pager lo -7
2020-11-14 02:05:51 +01:00
my = lo --author [Jj]anek
2021-04-11 22:47:51 +02:00
standup = my --since yesterday --all
2020-09-04 12:15:05 +02:00
co-authors = !git log | grep -i Co-Authored | awk '!a[$0]++'
2020-10-12 22:15:35 +02:00
when = git for-each-ref --sort=committerdate --format='%(refname:short) * %(authorname) * %(committerdate:relative)' refs/remotes/ # List all branches with their last updates
2020-09-04 12:15:05 +02:00
2021-01-11 12:27:55 +01:00
d = diff
dw = diff --color-words
dc = diff --color-words="[^[:space:]]|([[:alnum:]]|UTF_8_GUARD)+"
# MODIFY
2020-12-12 16:51:14 +01:00
# Local Changes
2020-10-12 22:15:35 +02:00
a = add -u
aa = add -u .
2020-10-03 11:37:54 +02:00
ap = add -p
c = commit -v
2021-02-13 18:36:56 +01:00
cme = commit -v --edit --message
2020-12-12 16:51:14 +01:00
2020-09-04 12:15:05 +02:00
cp = cherry-pick
2021-05-06 08:29:05 +02:00
rb = rebase
2021-03-30 20:29:08 +02:00
rbi = rebase --interactive
2020-10-12 22:15:35 +02:00
rbc = rebase --continue
2021-05-02 19:37:18 +02:00
rbm = !git rb $(git main)
2020-12-12 16:51:14 +01:00
sta = stash
2021-05-05 08:47:29 +02:00
stl = !git --no-pager stash list --pretty=tformat:'%gd%h - %s (%cr)'
2020-12-12 16:51:14 +01:00
sts = stash show -v
stp = stash pop
2021-05-05 08:47:29 +02:00
std = !git stash drop && git stl
2020-09-04 12:15:05 +02:00
rh = reset HEAD~
2020-10-12 22:15:35 +02:00
rs = reset --keep
2020-11-12 09:56:29 +01:00
ru = reset --keep @{upstream}
2021-03-25 10:27:44 +01:00
unstage = restore --staged --
2020-12-10 17:34:56 +01:00
2020-09-04 12:15:05 +02:00
format-head = !git stash && git-clang-format HEAD~ && git commit -a --amend --no-edit && git stash pop
2020-09-19 09:34:47 +02:00
2020-12-12 16:51:14 +01:00
# Update from remote
f = fetch
fa = fetch --all
fs = !git fetch && git st
2021-04-21 19:51:14 +02:00
lu = !git pull upstream ${1:-$(git curbranch)}
2020-12-12 16:51:14 +01:00
rg = rmgonebranches
2021-02-25 12:25:34 +01:00
su = submodule update --init --recursive
2021-02-13 18:36:56 +01:00
gcr = !git gc && git repack -a -d
2020-12-12 16:51:14 +01:00
# Change remote
2021-04-21 19:51:14 +02:00
ruu = !git fetch upstream && git reset --keep upstream/${1:-$(git curbranch)} && git push --no-verify --force-with-lease
luu = !git pull upstream ${1:-(git curbranch)} && git push --no-verify
2020-12-12 16:51:14 +01:00
pf = push --force-with-lease
2020-12-23 13:41:45 +01:00
cap = !git commit --all --amend --no-edit && git push --force-with-lease
2020-12-12 16:51:14 +01:00
2021-02-16 13:11:05 +01:00
[includeIf "gitdir:yadm/repo.git"]
2021-02-13 18:36:56 +01:00
path = "~/.config/yadm/gitconfig"
[includeIf "gitdir:~/data/.git"]
path = "config-data"