config.phundrak.com/.config/git/config

139 lines
3.1 KiB
Plaintext
Raw Normal View History

# -*- indent-tabs-mode: t; -*-
2023-06-30 08:51:34 +00:00
2019-10-24 13:36:40 +00:00
[user]
2022-11-18 02:55:50 +00:00
email = lucien@phundrak.com
name = Lucien Cartier-Tilet
signingkey = BD7789E705CB8DCA
2023-06-30 08:51:34 +00:00
2019-10-24 13:36:40 +00:00
[core]
2022-11-18 02:55:50 +00:00
editor = emacsclient -c -a emacs
whitespace = fix,-indent-with-non-tab,trailing-space
2023-06-30 08:51:34 +00:00
excludesfile = /home/phundrak/.gitignore_global
[pull]
rebase = true
[init]
defaultBranch = main
2019-10-24 13:36:40 +00:00
[color]
2022-11-18 02:55:50 +00:00
ui = auto
2023-06-30 08:51:34 +00:00
[web]
browser = firefox
2019-10-24 13:36:40 +00:00
[alias]
2022-11-18 02:55:50 +00:00
a = add --all
2023-06-30 07:34:49 +00:00
aca = !git add --all && git commit --amend
acan = !git add --all && git commit --amend --no-edit
2022-11-18 02:55:50 +00:00
b = branch
2023-06-30 07:34:49 +00:00
bd = branch -d
bdd = branch -D
2022-11-18 02:55:50 +00:00
c = commit -S
2023-06-30 07:34:49 +00:00
ca = commit -Sa
can = commit -Sa --no-edit
cm = commit -Sm
cam = commit -Sam
2022-11-18 02:55:50 +00:00
co = checkout
cob = checkout -b
2023-06-30 07:34:49 +00:00
cod = checkout develop
2022-11-18 02:55:50 +00:00
cl = clone
2023-06-30 08:51:34 +00:00
cl1 = clone --depth1
2023-06-30 07:34:49 +00:00
f = fetch
fp = fetch --prune
2022-11-18 02:55:50 +00:00
ps = push
2023-06-30 07:34:49 +00:00
psf = push --force-with-lease
2022-11-18 02:55:50 +00:00
pso = push origin
2023-06-30 07:34:49 +00:00
psfo = push --force-with-lease origin
2023-06-30 08:51:34 +00:00
pushall = !git remote | xargs -L1 git push
psl = !git remote | xargs -L1 git push
pullall = !git remote | xargs -L1 git pull
pll = !git remote | xargs -L1 git pull
2022-11-18 02:55:50 +00:00
pl = pull
pb = pull --rebase
2023-06-30 07:34:49 +00:00
r = rebase
ra = rebase --abort
rc = rebase --continue
rd = rebase develop
ri = rebase -i
2022-11-18 02:55:50 +00:00
rmf = rm -f
2023-06-30 07:34:49 +00:00
rmd = rm -r
rmdf = rm -rf
2022-11-18 02:55:50 +00:00
sm = submodule
sms = submodule status
sma = submodule add
smu = submodule update
smui = submodule update --init
smuir = submodule update --init --recursive
2023-06-30 07:34:49 +00:00
st = stash
stc = stash clear
stp = stash pop
stw = stash show
2022-11-18 02:55:50 +00:00
u = reset --
unstage = reset --
2023-06-30 08:51:34 +00:00
d = diff -w
l = log --oneline --graph --decorate
s = status
staged = diff --cached
2023-06-30 07:34:49 +00:00
upstream = !git push -u origin HEAD
2023-06-30 08:51:34 +00:00
[sendemail]
2022-11-18 02:55:50 +00:00
smtpserver = mail.phundrak.com
smtpuser = lucien@phundrak.com
smtpencryption = tls
smtpserverport = 587
2023-06-30 08:51:34 +00:00
[credentials "smtp://lucien@phundrak.com@mail.phundrak.com:587"]
helper = "secret-tool lookup password email_lucien-phundrak-com"
2019-10-24 13:36:40 +00:00
[magithub]
2022-11-18 02:55:50 +00:00
online = true
2019-10-24 13:36:40 +00:00
[magithub "status"]
2022-11-18 02:55:50 +00:00
includeStatusHeader = true
includePullRequestsSection = true
includeIssuesSection = true
2023-06-30 08:51:34 +00:00
2019-10-24 13:36:40 +00:00
[gpg]
2022-11-18 02:55:50 +00:00
program = gpg2
2019-10-24 21:07:55 +00:00
[commit]
2022-11-18 02:55:50 +00:00
gpgsign = true
2023-06-30 08:51:34 +00:00
[merge]
tool = ediff
[mergetool.ediff]
cmd = emacs --eval \" (progn (defun ediff-write-merge-buffer () (let ((file ediff-merge-store-file)) (set-buffer ediff-buffer-C) (write-region (point-min) (point-max) file) (message \\\"Merge buffer saved in: %s\\\" file) (set-buffer-modified-p nil) (sit-for 1))) (setq ediff-quit-hook 'kill-emacs ediff-quit-merge-hook 'ediff-write-merge-buffer) (ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\"))\"
[pager]
2022-11-18 02:55:50 +00:00
diff = delta
log = delta
reflog = delta
show = delta
[delta]
2022-11-18 02:55:50 +00:00
features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse
[delta "decorations"]
2022-11-18 02:55:50 +00:00
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
2023-06-30 08:51:34 +00:00
[interactive]
diffFilter = delta --color-only
[github]
user = phundrak
[url "https://phundrak@github.com"]
insteadOf = https://github.com
[url "https://phundrak@labs.phundrak.com"]
insteadOf = https://labs.phundrak.com
2023-06-30 08:51:34 +00:00
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process