2019-10-24 13:36:40 +00:00
|
|
|
[user]
|
2019-11-09 17:46:07 +00:00
|
|
|
email = lucien@phundrak.com
|
|
|
|
|
name = Lucien Cartier-Tilet
|
2019-10-24 13:36:40 +00:00
|
|
|
signingkey = BD7789E705CB8DCA
|
|
|
|
|
[core]
|
|
|
|
|
# editor = vim
|
|
|
|
|
whitespace = fix,-indent-with-non-tab,trailing-space
|
|
|
|
|
excludesfile = /home/phundrak/dotfiles/.gitignore_global
|
|
|
|
|
autocrlf = false
|
|
|
|
|
[web]
|
2019-11-09 17:46:07 +00:00
|
|
|
browser = firefox
|
2019-10-24 13:36:40 +00:00
|
|
|
[color]
|
|
|
|
|
ui = auto
|
|
|
|
|
[alias]
|
|
|
|
|
a = add --all
|
|
|
|
|
####
|
|
|
|
|
b = branch
|
|
|
|
|
####
|
|
|
|
|
c = commit -S
|
|
|
|
|
ca = commit -a
|
|
|
|
|
cm = commit -m
|
|
|
|
|
cam = commit -am
|
|
|
|
|
####
|
|
|
|
|
co = checkout
|
|
|
|
|
cob = checkout -b
|
|
|
|
|
####
|
|
|
|
|
cl = clone
|
2020-07-11 16:21:35 +00:00
|
|
|
cl1 = clone --depth=1
|
2019-10-24 13:36:40 +00:00
|
|
|
####
|
|
|
|
|
d = diff -w
|
|
|
|
|
####
|
|
|
|
|
l = log --oneline --graph --decorate
|
|
|
|
|
####
|
|
|
|
|
ps = push
|
|
|
|
|
psf = push -f
|
|
|
|
|
pso = push origin
|
|
|
|
|
psfo = push -f origin
|
|
|
|
|
psom = push origin master
|
|
|
|
|
psfom = push -f origin master
|
|
|
|
|
####
|
|
|
|
|
pl = pull
|
|
|
|
|
pb = pull --rebase
|
|
|
|
|
####
|
|
|
|
|
re = reset
|
|
|
|
|
reh = reset --hard
|
|
|
|
|
rehh = reset --hard HEAD
|
|
|
|
|
####
|
|
|
|
|
r = remote
|
|
|
|
|
ra = remote add
|
|
|
|
|
rr = remote rm
|
|
|
|
|
###
|
|
|
|
|
rmf = rm -f
|
|
|
|
|
rmrf = rm -r -f
|
|
|
|
|
####
|
|
|
|
|
s = status
|
2020-02-13 18:08:24 +00:00
|
|
|
sm = submodule
|
|
|
|
|
sms = submodule status
|
|
|
|
|
sma = submodule add
|
|
|
|
|
smu = submodule update
|
|
|
|
|
smui = submodule update --init
|
|
|
|
|
smuir = submodule update --init --recursive
|
2019-10-24 13:36:40 +00:00
|
|
|
####
|
|
|
|
|
staged = diff --cached
|
|
|
|
|
####
|
|
|
|
|
sc = stash clear
|
|
|
|
|
sp = stash pop
|
|
|
|
|
sw = stash show
|
|
|
|
|
####
|
|
|
|
|
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
|
|
|
|
|
####
|
|
|
|
|
u = reset --
|
|
|
|
|
unstage = reset --
|
|
|
|
|
[magithub]
|
|
|
|
|
online = true
|
|
|
|
|
[magithub "status"]
|
|
|
|
|
includeStatusHeader = true
|
|
|
|
|
includePullRequestsSection = true
|
|
|
|
|
includeIssuesSection = true
|
|
|
|
|
[gpg]
|
|
|
|
|
program = gpg2
|
|
|
|
|
[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\\\"))\"
|
|
|
|
|
[merge]
|
|
|
|
|
tool = ediff
|
|
|
|
|
[github]
|
|
|
|
|
user = phundrak
|
2019-10-24 21:07:55 +00:00
|
|
|
[commit]
|
|
|
|
|
gpgsign = true
|
2020-07-26 08:21:54 +00:00
|
|
|
[pull]
|
|
|
|
|
rebase = false
|
