2022-11-04 14:51:17 +00:00
|
|
|
[core]
|
|
|
|
|
editor = emacsclient
|
|
|
|
|
|
2014-06-22 16:16:14 +00:00
|
|
|
[user]
|
2018-07-20 09:00:54 +00:00
|
|
|
name = Julien Palard
|
|
|
|
|
email = julien@palard.fr
|
2022-11-04 14:51:17 +00:00
|
|
|
signingkey = 0x46EBCD72F08E6717
|
2014-06-22 16:16:14 +00:00
|
|
|
|
|
|
|
|
[push]
|
2018-07-20 09:00:54 +00:00
|
|
|
default = current
|
2014-06-22 16:16:14 +00:00
|
|
|
|
2022-11-04 14:51:17 +00:00
|
|
|
[commit]
|
|
|
|
|
gpgsign = true
|
|
|
|
|
|
2018-07-20 09:00:54 +00:00
|
|
|
[alias]
|
2019-12-01 22:02:41 +00:00
|
|
|
ap = add -p
|
|
|
|
|
b = branch
|
|
|
|
|
c = commit
|
2019-06-08 13:42:42 +00:00
|
|
|
lg = log --graph --pretty=format:'%C(auto)%h%d %s %C(blue)%ci %C(green)%an%Creset'
|
2019-12-01 22:02:41 +00:00
|
|
|
p = push
|
|
|
|
|
pf = pull --ff-only
|
|
|
|
|
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"
|
|
|
|
|
st = status -s
|
2022-11-04 14:51:17 +00:00
|
|
|
|
|
|
|
|
[init]
|
|
|
|
|
defaultBranch = main
|
|
|
|
|
|
|
|
|
|
[merge]
|
|
|
|
|
conflictstyle = diff3
|
|
|
|
|
|
|
|
|
|
[merge "po3way"]
|
|
|
|
|
name = po file merge driver
|
|
|
|
|
driver = po3way --debug --git-merge-driver -- %A %O %B
|
