docs(git): use tabs instead of spaces

This commit is contained in:
Lucien Cartier-Tilet 2023-11-03 19:52:46 +01:00
parent df301c72e1
commit 35d74b4c2f
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA

View File

@ -12,36 +12,36 @@
#+begin_src conf-unix #+begin_src conf-unix
[user] [user]
email = lucien@phundrak.com email = lucien@phundrak.com
name = Lucien Cartier-Tilet name = Lucien Cartier-Tilet
signingkey = BD7789E705CB8DCA signingkey = BD7789E705CB8DCA
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[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/.gitignore_global excludesfile = /home/phundrak/.gitignore_global
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[pull] [pull]
rebase = true rebase = true
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[init] [init]
defaultBranch = main defaultBranch = main
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[color] [color]
ui = auto ui = auto
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[web] [web]
browser = firefox browser = firefox
#+end_src #+end_src
** Aliases ** Aliases
@ -55,27 +55,27 @@
#+name: abbrev-gen #+name: abbrev-gen
#+begin_src emacs-lisp :tangle no :exports none :var abbrevs=git-push-abbrev :wrap "src conf-unix :tangle no" #+begin_src emacs-lisp :tangle no :exports none :var abbrevs=git-push-abbrev :wrap "src conf-unix :tangle no"
(mapconcat (lambda (abbreviation) (mapconcat (lambda (abbreviation)
(replace-regexp-in-string (replace-regexp-in-string
(concat (regexp-quote "\\vert") (rx (? "{}"))) (concat (regexp-quote "\\vert") (rx (? "{}")))
"|" "|"
(concat "\t" (concat "\t"
(string-replace "=" "" (car abbreviation)) (string-replace "=" "" (car abbreviation))
" = " " = "
(string-replace "=" "" (cadr abbreviation))))) (string-replace "=" "" (cadr abbreviation)))))
abbrevs abbrevs
"\n") "\n")
#+end_src #+end_src
#+RESULTS: abbrev-gen #+RESULTS: abbrev-gen
#+begin_src conf-unix :tangle no #+begin_src conf-unix :tangle no
ps = push ps = push
psf = push --force-with-lease psf = push --force-with-lease
pso = push origin pso = push origin
psfo = push --force-with-lease origin psfo = push --force-with-lease origin
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
#+end_src #+end_src
#+name: git-branch-abbrev #+name: git-branch-abbrev
@ -207,89 +207,89 @@
*** Sendemail *** Sendemail
#+begin_src conf-unix #+begin_src conf-unix
[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
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[credentials "smtp://lucien@phundrak.com@mail.phundrak.com:587"] [credentials "smtp://lucien@phundrak.com@mail.phundrak.com:587"]
helper = "secret-tool lookup password email_lucien-phundrak-com" helper = "secret-tool lookup password email_lucien-phundrak-com"
#+end_src #+end_src
*** Magit *** Magit
#+begin_src conf-unix #+begin_src conf-unix
[magithub] [magithub]
online = true online = true
[magithub "status"] [magithub "status"]
includeStatusHeader = true includeStatusHeader = true
includePullRequestsSection = true includePullRequestsSection = true
includeIssuesSection = true includeIssuesSection = true
#+end_src #+end_src
*** GPG *** GPG
#+begin_src conf-unix #+begin_src conf-unix
[gpg] [gpg]
program = gpg2 program = gpg2
[commit] [commit]
gpgsign = true gpgsign = true
#+end_src #+end_src
*** Merge *** Merge
#+begin_src conf-unix #+begin_src conf-unix
[merge] [merge]
tool = ediff tool = ediff
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[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\\\"))\"
#+end_src #+end_src
*** Pager *** Pager
#+begin_src conf-unix #+begin_src conf-unix
[pager] [pager]
diff = delta diff = delta
log = delta log = delta
reflog = delta reflog = delta
show = delta show = delta
#+end_src #+end_src
*** Delta *** Delta
#+begin_src conf-unix #+begin_src conf-unix
[delta] [delta]
features = side-by-side line-numbers decorations features = side-by-side line-numbers decorations
whitespace-error-style = 22 reverse whitespace-error-style = 22 reverse
[delta "decorations"] [delta "decorations"]
commit-decoration-style = bold yellow box ul commit-decoration-style = bold yellow box ul
file-style = bold yellow ul file-style = bold yellow ul
file-decoration-style = none file-decoration-style = none
[interactive] [interactive]
diffFilter = delta --color-only diffFilter = delta --color-only
#+end_src #+end_src
*** Git forges *** Git forges
#+begin_src conf-unix #+begin_src conf-unix
[github] [github]
user = phundrak user = phundrak
#+end_src #+end_src
#+begin_src conf-unix #+begin_src conf-unix
[url "https://phundrak@github.com"] [url "https://phundrak@github.com"]
insteadOf = https://github.com insteadOf = https://github.com
[url "https://phundrak@labs.phundrak.com"] [url "https://phundrak@labs.phundrak.com"]
insteadOf = https://labs.phundrak.com insteadOf = https://labs.phundrak.com
#+end_src #+end_src
*** LFS *** LFS
#+begin_src conf-unix #+begin_src conf-unix
[filter "lfs"] [filter "lfs"]
required = true required = true
clean = git-lfs clean -- %f clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f smudge = git-lfs smudge -- %f
process = git-lfs filter-process process = git-lfs filter-process
#+end_src #+end_src