dotfiles/.config/git/config

[core]
    editor = emacsclient

[user]
    name = Julien Palard
    email = julien@palard.fr
    signingkey = 0x46EBCD72F08E6717

[push]
    default = current

[commit]
    gpgsign = true

[rerere]
    enabled = true

[pull]
    ff = only

[diff]
    algorithm = histogram

[alias]
    ap = add -p
    b = branch
    c = commit
    lg = log --graph --pretty=format:'%C(auto)%h%d %s %C(blue)%ci %C(green)%an%Creset'
    p = push
    pr = pull --rebase
    pull-request = !sh -c \"git fetch upstream pull/${1}/head:pr_${1} && git worktree add ../$(basename $(git rev-parse --show-toplevel))-pr-${1} pr_${1}\"
    remote-gh = "!f() { git remote add $1 https://github.com/$1/$(basename $(pwd))/; git fetch $1; }; f"
    remote-afpy = "!f() { git remote add $1 git@git.afpy.org:$1/$(basename $(pwd)).git; git fetch $1; }; f"
    st = status -s

[init]
	defaultBranch = main

[merge]
	conflictstyle = zdiff3

[merge "po3way"]
    name = po file merge driver
    driver = po3way --debug --git-merge-driver -- %A %O %B

[branch]
	sort = -committerdate

[column]
	ui = auto