107 lines
3.5 KiB
Django/Jinja
107 lines
3.5 KiB
Django/Jinja
[user]
|
|
name = {{ common_git_username }}
|
|
email = {{ common_git_email }}
|
|
{%- if common_git_force_sign and common_git_signing_key +%}
|
|
signingkey = {{ common_git_signing_key }}
|
|
{%- endif +%}
|
|
[commit]
|
|
{% if common_git_force_sign -%}
|
|
gpgsign = true
|
|
{%- else -%}
|
|
gpgsign = false
|
|
{%- endif +%}
|
|
[tag]
|
|
{% if common_git_force_sign -%}
|
|
gpgsign = true
|
|
{%- else -%}
|
|
gpgsign = false
|
|
{%- endif +%}
|
|
{%- raw %}
|
|
[alias]
|
|
br = "branch"
|
|
ci = "commit"
|
|
cmp = "!f() { git log --graph --color --boundary --oneline HEAD...origin/$1; }; f"
|
|
co = "checkout"
|
|
cp = "cherry-pick"
|
|
cpo = "cherry-pick --strategy=recursive -Xours --allow-empty"
|
|
cpt = "cherry-pick --strategy=recursive -Xtheirs --allow-empty"
|
|
dm = "log --graph --color --boundary --oneline HEAD...origin/master"
|
|
dup = "!git log --graph --color --boundary --oneline HEAD...origin/$(git rev-parse --abbrev-ref HEAD)"
|
|
psuo = "!git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)"
|
|
rf = "!git reflog --date=iso"
|
|
ru = "remote update"
|
|
rup = "!f() { git remote update && git pull --rebase; }; f"
|
|
pr = "pull --rebase"
|
|
st = "status"
|
|
subup = "!git submodule foreach git remote update"
|
|
undo = "!f() { git reset --soft HEAD~${1:-1}; }; f"
|
|
|
|
lg = lg1
|
|
lg1 = lg1-specific --all
|
|
lg2 = lg2-specific --all
|
|
lg3 = lg3-specific --all
|
|
lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)'
|
|
lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)'
|
|
lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'
|
|
[core]
|
|
editor = emacs
|
|
autocrlf = input
|
|
pager = delta
|
|
[color]
|
|
status = auto
|
|
branch = auto
|
|
interactive = auto
|
|
diff = auto
|
|
ui = true
|
|
pager = true
|
|
[delta]
|
|
navigate = true
|
|
line-numbers = true
|
|
[push]
|
|
default = simple
|
|
[merge]
|
|
conflictstyle = diff3
|
|
[pull]
|
|
rebase = true
|
|
[diff]
|
|
colorMoved = default
|
|
[diff "pdf"]
|
|
textconv = pdfinfo
|
|
[diff "pdfdiff"]
|
|
command = diffpdf
|
|
[init]
|
|
defaultBranch = main
|
|
[interactive]
|
|
diffFilter = delta --color-only
|
|
[submodule]
|
|
recurse = true
|
|
[advice]
|
|
addEmbeddedRepo = false
|
|
addEmptyPathspec = false
|
|
addIgnoredFile = false
|
|
amWorkDir = false
|
|
checkoutAmbiguousRemoteBranchName = false
|
|
commitBeforeMerge = false
|
|
detachedHead = false
|
|
fetchShowForcedUpdates = false
|
|
ignoredHook = false
|
|
implicitIdentity = false
|
|
nestedTag = false
|
|
pushAlreadyExists = true
|
|
pushFetchFirst = true
|
|
pushNeedsForce = true
|
|
pushNonFFCurrent = true
|
|
pushNonFFMatching = true
|
|
pushRefNeedsUpdate = true
|
|
pushUnqualifiedRefname = true
|
|
pushUpdateRejected = true
|
|
resetQuiet = false
|
|
resolveConflict = true
|
|
rmHints = false
|
|
sequencerInUse = false
|
|
statusAheadBehind = false
|
|
statusHints = false
|
|
statusUoption = false
|
|
submoduleAlternateErrorStrategyDie = false
|
|
waitingForEditor = false
|
|
{% endraw %}
|