docs(git): use tabs instead of spaces
This commit is contained in:
parent
df301c72e1
commit
35d74b4c2f
GPG Key ID:
BD7789E705CB8DCA
114
docs/git.org
114
docs/git.org
|
|
@ -12,36 +12,36 @@
|
|||
|
||||
#+begin_src conf-unix
|
||||
[user]
|
||||
email = lucien@phundrak.com
|
||||
name = Lucien Cartier-Tilet
|
||||
signingkey = BD7789E705CB8DCA
|
||||
email = lucien@phundrak.com
|
||||
name = Lucien Cartier-Tilet
|
||||
signingkey = BD7789E705CB8DCA
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[core]
|
||||
editor = emacsclient -c -a emacs
|
||||
whitespace = fix,-indent-with-non-tab,trailing-space
|
||||
excludesfile = /home/phundrak/.gitignore_global
|
||||
editor = emacsclient -c -a emacs
|
||||
whitespace = fix,-indent-with-non-tab,trailing-space
|
||||
excludesfile = /home/phundrak/.gitignore_global
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[pull]
|
||||
rebase = true
|
||||
rebase = true
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[init]
|
||||
defaultBranch = main
|
||||
defaultBranch = main
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[color]
|
||||
ui = auto
|
||||
ui = auto
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[web]
|
||||
browser = firefox
|
||||
browser = firefox
|
||||
#+end_src
|
||||
|
||||
** Aliases
|
||||
|
|
@ -55,27 +55,27 @@
|
|||
#+name: abbrev-gen
|
||||
#+begin_src emacs-lisp :tangle no :exports none :var abbrevs=git-push-abbrev :wrap "src conf-unix :tangle no"
|
||||
(mapconcat (lambda (abbreviation)
|
||||
(replace-regexp-in-string
|
||||
(concat (regexp-quote "\\vert") (rx (? "{}")))
|
||||
"|"
|
||||
(concat "\t"
|
||||
(string-replace "=" "" (car abbreviation))
|
||||
" = "
|
||||
(string-replace "=" "" (cadr abbreviation)))))
|
||||
abbrevs
|
||||
"\n")
|
||||
(replace-regexp-in-string
|
||||
(concat (regexp-quote "\\vert") (rx (? "{}")))
|
||||
"|"
|
||||
(concat "\t"
|
||||
(string-replace "=" "" (car abbreviation))
|
||||
" = "
|
||||
(string-replace "=" "" (cadr abbreviation)))))
|
||||
abbrevs
|
||||
"\n")
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: abbrev-gen
|
||||
#+begin_src conf-unix :tangle no
|
||||
ps = push
|
||||
psf = push --force-with-lease
|
||||
pso = push origin
|
||||
psfo = push --force-with-lease origin
|
||||
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
|
||||
ps = push
|
||||
psf = push --force-with-lease
|
||||
pso = push origin
|
||||
psfo = push --force-with-lease origin
|
||||
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
|
||||
#+end_src
|
||||
|
||||
#+name: git-branch-abbrev
|
||||
|
|
@ -207,89 +207,89 @@
|
|||
*** Sendemail
|
||||
#+begin_src conf-unix
|
||||
[sendemail]
|
||||
smtpserver = mail.phundrak.com
|
||||
smtpuser = lucien@phundrak.com
|
||||
smtpencryption = tls
|
||||
smtpserverport = 587
|
||||
smtpserver = mail.phundrak.com
|
||||
smtpuser = lucien@phundrak.com
|
||||
smtpencryption = tls
|
||||
smtpserverport = 587
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[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
|
||||
|
||||
*** Magit
|
||||
#+begin_src conf-unix
|
||||
[magithub]
|
||||
online = true
|
||||
online = true
|
||||
[magithub "status"]
|
||||
includeStatusHeader = true
|
||||
includePullRequestsSection = true
|
||||
includeIssuesSection = true
|
||||
includeStatusHeader = true
|
||||
includePullRequestsSection = true
|
||||
includeIssuesSection = true
|
||||
#+end_src
|
||||
|
||||
*** GPG
|
||||
#+begin_src conf-unix
|
||||
[gpg]
|
||||
program = gpg2
|
||||
program = gpg2
|
||||
[commit]
|
||||
gpgsign = true
|
||||
gpgsign = true
|
||||
#+end_src
|
||||
|
||||
*** Merge
|
||||
#+begin_src conf-unix
|
||||
[merge]
|
||||
tool = ediff
|
||||
tool = ediff
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[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
|
||||
|
||||
*** Pager
|
||||
#+begin_src conf-unix
|
||||
[pager]
|
||||
diff = delta
|
||||
log = delta
|
||||
reflog = delta
|
||||
show = delta
|
||||
diff = delta
|
||||
log = delta
|
||||
reflog = delta
|
||||
show = delta
|
||||
#+end_src
|
||||
|
||||
*** Delta
|
||||
#+begin_src conf-unix
|
||||
[delta]
|
||||
features = side-by-side line-numbers decorations
|
||||
whitespace-error-style = 22 reverse
|
||||
features = side-by-side line-numbers decorations
|
||||
whitespace-error-style = 22 reverse
|
||||
|
||||
[delta "decorations"]
|
||||
commit-decoration-style = bold yellow box ul
|
||||
file-style = bold yellow ul
|
||||
file-decoration-style = none
|
||||
commit-decoration-style = bold yellow box ul
|
||||
file-style = bold yellow ul
|
||||
file-decoration-style = none
|
||||
|
||||
[interactive]
|
||||
diffFilter = delta --color-only
|
||||
diffFilter = delta --color-only
|
||||
#+end_src
|
||||
|
||||
*** Git forges
|
||||
#+begin_src conf-unix
|
||||
[github]
|
||||
user = phundrak
|
||||
user = phundrak
|
||||
#+end_src
|
||||
|
||||
#+begin_src conf-unix
|
||||
[url "https://phundrak@github.com"]
|
||||
insteadOf = https://github.com
|
||||
insteadOf = https://github.com
|
||||
|
||||
[url "https://phundrak@labs.phundrak.com"]
|
||||
insteadOf = https://labs.phundrak.com
|
||||
insteadOf = https://labs.phundrak.com
|
||||
#+end_src
|
||||
|
||||
*** LFS
|
||||
#+begin_src conf-unix
|
||||
[filter "lfs"]
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
#+end_src
|
||||
|
|
|
|||
Loading…
Reference in New Issue