phundrak
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Activity

[git] Tabs to spaces

This commit is contained in:
Lucien Cartier-Tilet 2021-05-21 14:10:15 +02:00
parent 0afda115ee
commit 50317fb020
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
1 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
.gitconfig
View File

@ -1,99 +1,99 @@
[user] [user]
email = lucien@phundrak.com email = lucien@phundrak.com
name = Lucien Cartier-Tilet name = Lucien Cartier-Tilet
signingkey = BD7789E705CB8DCA signingkey = BD7789E705CB8DCA
[core] [core]
editor = emacsclient -c -a emacs editor = emacsclient -c -a emacs
whitespace = fix,-indent-with-non-tab,trailing-space whitespace = fix,-indent-with-non-tab,trailing-space
excludesfile = /home/phundrak/dotfiles/.gitignore_global excludesfile = /home/phundrak/dotfiles/.gitignore_global
[web] [web]
browser = firefox browser = firefox
[color] [color]
ui = auto ui = auto
[alias] [alias]
a = add --all a = add --all
#### ####
b = branch b = branch
#### ####
c = commit -S c = commit -S
ca = commit -a ca = commit -a
cm = commit -m cm = commit -m
cam = commit -am cam = commit -am
#### ####
co = checkout co = checkout
cob = checkout -b cob = checkout -b
#### ####
cl = clone cl = clone
cl1 = clone --depth=1 cl1 = clone --depth=1
#### ####
d = diff -w d = diff -w
#### ####
l = log --oneline --graph --decorate l = log --oneline --graph --decorate
#### ####
ps = push ps = push
psf = push -f psf = push -f
pso = push origin pso = push origin
psfo = push -f origin psfo = push -f origin
psom = push origin master psom = push origin master
psfom = push -f origin master psfom = push -f origin master
#### ####
pl = pull pl = pull
pb = pull --rebase pb = pull --rebase
#### ####
re = reset re = reset
reh = reset --hard reh = reset --hard
rehh = reset --hard HEAD rehh = reset --hard HEAD
#### ####
r = remote r = remote
ra = remote add ra = remote add
rr = remote rm rr = remote rm
### ###
rmf = rm -f rmf = rm -f
rmrf = rm -r -f rmrf = rm -r -f
#### ####
s = status s = status
sm = submodule sm = submodule
sms = submodule status sms = submodule status
sma = submodule add sma = submodule add
smu = submodule update smu = submodule update
smui = submodule update --init smui = submodule update --init
smuir = submodule update --init --recursive smuir = submodule update --init --recursive
#### ####
staged = diff --cached staged = diff --cached
#### ####
sc = stash clear sc = stash clear
sp = stash pop sp = stash pop
sw = stash show sw = stash show
#### ####
pushall = !git remote | xargs -L1 git push pushall = !git remote | xargs -L1 git push
psl = !git remote | xargs -L1 git push psl = !git remote | xargs -L1 git push
pullall = !git remote | xargs -L1 git pull pullall = !git remote | xargs -L1 git pull
pll = !git remote | xargs -L1 git pull pll = !git remote | xargs -L1 git pull
#### ####
u = reset -- u = reset --
unstage = reset -- unstage = reset --
[sendemail] [sendemail]
smtpserver = mail.phundrak.com smtpserver = mail.phundrak.com
smtpuser = lucien@phundrak.com smtpuser = lucien@phundrak.com
smtpencryption = tls smtpencryption = tls
smtpserverport = 587 smtpserverport = 587
[magithub] [magithub]
online = true online = true
[magithub "status"] [magithub "status"]
includeStatusHeader = true includeStatusHeader = true
includePullRequestsSection = true includePullRequestsSection = true
includeIssuesSection = true includeIssuesSection = true
[gpg] [gpg]
program = gpg2 program = gpg2
[mergetool.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\\\"))\" 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] [merge]
tool = ediff tool = ediff
[github] [github]
user = phundrak user = phundrak
[commit] [commit]
gpgsign = true gpgsign = true
[pull] [pull]
rebase = false rebase = false
[init] [init]
defaultBranch = main defaultBranch = main