Merge remote-tracking branch 'origin/master'
j3s j3s@c3f.net
Fri, 12 Mar 2021 13:49:31 -0600
4 files changed,
34 insertions(+),
31 deletions(-)
M
.config/git/config
→
.config/git/config
@@ -1,46 +1,49 @@
[advice] detachedhead = false [alias] - s = status - d = diff - p = pull --prune --rebase - ds = diff --staged - d1 = diff HEAD~1 HEAD - d2 = diff HEAD~2 HEAD - co = checkout - br = branch - amend = commit --amend -m - aa = add -A . - cm = commit -m - lg = log --color --graph --pretty=format:'%Cgreen%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit - lgs = log --graph --pretty=format:'%Cgreen%h%Creset - %s %C(yellow)%d' --abbrev-commit + s = status + d = diff + p = pull --prune --rebase + ds = diff --staged + d1 = diff HEAD~1 HEAD + d2 = diff HEAD~2 HEAD + co = checkout + br = branch + amend = commit --amend -m + aa = add -A . + cm = commit -m + lg = log --color --graph --pretty=format:'%Cgreen%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit + lgs = log --graph --pretty=format:'%Cgreen%h%Creset - %s %C(yellow)%d' --abbrev-commit [color] - ui = auto + ui = auto [core] - excludesfile = ~/.config/git/gitignore - editor = vim - quotepath = false - autocrlf = input + excludesfile = ~/.config/git/gitignore + editor = vim + pager = less + quotepath = false + autocrlf = input [apply] - whitespace = nowarn + whitespace = nowarn [difftool] - prompt = false + prompt = false [submodule] - fetchJobs = 4 + fetchJobs = 4 [changelog] - format = * %s [%an] + format = * %s [%an] [user] - name = j3s - email = j3s@c3f.net + name = j3s + email = j3s@c3f.net [sendemail] - smtpserver = smtp.migadu.com - smtpuser = j3s@c3f.net - smtpencryption = tls - smtpserverport = 465 - annotate = yes + smtpserver = smtp.migadu.com + smtpuser = j3s@c3f.net + smtpencryption = tls + smtpserverport = 465 + annotate = yes [pull] ff = only [includeIf "gitdir:~/git/"] - path = ~/.config/git/config-work + path = ~/.config/git/config-work [includeIf "gitdir:~/howdocs/"] - path = ~/.config/git/config-work + path = ~/.config/git/config-work +[pager] + status = true