2024-06-15 15:40:51 -04:00
|
|
|
[user]
|
|
|
|
|
name = Eric Renfro
|
|
|
|
|
email = psi-jack@linux-help.org
|
|
|
|
|
#signingkey = 25787986B19167B89BFF55CF3159FF4CB13EBFB4
|
|
|
|
|
#signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILOOehoX8okqwKyFj4ozRODK0tIb3aeHlYC9re1/3IbC Eric Renfro (Home/ed25519)
|
|
|
|
|
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILOOehoX8okqwKyFj4ozRODK0tIb3aeHlYC9re1/3IbC Eric Renfro (Home/ed25519)
|
|
|
|
|
[gpg]
|
|
|
|
|
#program = gpg2
|
|
|
|
|
format = ssh
|
|
|
|
|
[format]
|
|
|
|
|
signOff = true
|
|
|
|
|
[core]
|
2024-06-15 22:38:33 -04:00
|
|
|
{% if yadm.os == "Linux" %}
|
|
|
|
|
editor = flatpak run re.sonny.Commit
|
|
|
|
|
{% else %}
|
2024-06-15 15:40:51 -04:00
|
|
|
editor = micro
|
2024-06-15 22:38:33 -04:00
|
|
|
{% endif %}
|
2024-06-15 15:40:51 -04:00
|
|
|
pager = less -r
|
|
|
|
|
[commit]
|
|
|
|
|
gpgsign = true
|
|
|
|
|
[merge]
|
|
|
|
|
ff = only
|
|
|
|
|
[pull]
|
|
|
|
|
rebase = true
|
|
|
|
|
[status]
|
|
|
|
|
submoduleSummary = false
|
|
|
|
|
[tag]
|
|
|
|
|
forceSignAnnotated = true
|
|
|
|
|
[init]
|
|
|
|
|
defaultBranch = master
|
|
|
|
|
[sendemail]
|
|
|
|
|
smtpencryption = tls
|
|
|
|
|
smtpserver = smtp.linux-help.org
|
|
|
|
|
smtpuser = psi-jack@linux-help.org
|
|
|
|
|
smtpserverport = 587
|
|
|
|
|
[filter "lfs"]
|
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
|
process = git-lfs filter-process
|
|
|
|
|
required = true
|
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
|
[url "ssh://git@github.com"]
|
|
|
|
|
pushInsteadOf = https://github.com
|
|
|
|
|
[url "ssh://git@git.linux-help.org"]
|
|
|
|
|
pushInsteadOf = https://git.linux-help.org
|
|
|
|
|
[color]
|
|
|
|
|
ui = true
|
|
|
|
|
[credential]
|
|
|
|
|
{% if yadm.os == "Darwin" %}
|
|
|
|
|
helper = osxkeychain
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% if yadm.distro_family == "arch" %}
|
|
|
|
|
helper = /usr/lib/git-core/git-credential-libsecret
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% if yadm.distro_family == "Debian" %}
|
|
|
|
|
helper = /usr/share/doc/git/contrib/credential/libsecret/git-credential-libsecret
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% if yadm.distro == "Fedora" %}
|
|
|
|
|
helper = /usr/libexec/git-core/git-credential-libsecret
|
|
|
|
|
{% endif %}
|
|
|
|
|
{% if yadm.distro == "openSUSE" %}
|
|
|
|
|
helper = /usr/libexec/git/git-credential-libsecret
|
|
|
|
|
{% endif %}
|
|
|
|
|
[alias]
|
|
|
|
|
up = !git pull --prune $@ && git submodule update --init --recursive
|
|
|
|
|
a = add
|
|
|
|
|
ap = add -p
|
|
|
|
|
amc = am --continue
|
|
|
|
|
b = branch
|
|
|
|
|
bm = branch --merged
|
|
|
|
|
bnm = branch --no-merged
|
|
|
|
|
c = commit
|
|
|
|
|
cl = clone
|
|
|
|
|
ca = commit --amend
|
|
|
|
|
cane = commit --amend --no-edit
|
|
|
|
|
cf = commit --fixup
|
|
|
|
|
cm = commit --message
|
|
|
|
|
co = checkout
|
|
|
|
|
cob = checkout -b
|
|
|
|
|
com = checkout master
|
|
|
|
|
cp = cherry-pick
|
|
|
|
|
d = diff
|
|
|
|
|
dc = diff --cached
|
|
|
|
|
dom = diff origin/master
|
|
|
|
|
fo = fetch origin
|
|
|
|
|
g = grep --line-number
|
|
|
|
|
mbhom = merge-base HEAD origin/master
|
|
|
|
|
mff = merge --ff-only
|
|
|
|
|
ol = log --pretty=oneline
|
|
|
|
|
l = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
|
|
|
|
|
pu = push
|
|
|
|
|
puf = push --force
|
|
|
|
|
pl = pull --rebase --autostash
|
|
|
|
|
r = restore
|
|
|
|
|
ra = rebase --abort
|
|
|
|
|
rc = rebase --continue
|
|
|
|
|
ri = rebase --interactive
|
|
|
|
|
rl = reflog
|
|
|
|
|
riom = rebase --interactive origin/master
|
|
|
|
|
rpo = remote prune origin
|
|
|
|
|
s = status -sb
|
|
|
|
|
ss = commit --message snapshot --no-gpg-sign
|
|
|
|
|
su = submodule update
|
|
|
|
|
wd = diff --patience --word-diff
|
|
|
|
|
|
