From 9886e23d881a44b96898076cdc7f2d2ac610c166 Mon Sep 17 00:00:00 2001 From: Sebastian Schulze Date: Mon, 27 Jan 2020 16:03:20 +0100 Subject: [PATCH] [git] Add mah signatures and gitconfig --- dot_gitconfig.tmpl | 80 ++++++++++++++++++++++++++++++++++++++++ dot_signature.rubyberlin | 8 ++++ dot_signature.tmpl | 12 ++++++ 3 files changed, 100 insertions(+) create mode 100644 dot_gitconfig.tmpl create mode 100644 dot_signature.rubyberlin create mode 100644 dot_signature.tmpl diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl new file mode 100644 index 0000000..625b2c7 --- /dev/null +++ b/dot_gitconfig.tmpl @@ -0,0 +1,80 @@ +[user] + name = Sebastian Schulze + email = github.com@{{ .chezmoi.username }}.com + signingkey = github.com@{{ .chezmoi.username }}.com + +[core] + excludesfile = ~/.gitignore + editor = em -nw + hooksPath = ~/.config/git/hooks + +[commit] + gpgsign = true + +[alias] + lol= 'log' '--oneline' '--graph' '--decorate' + lg1 = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(bold white)— %an%C(reset)%C(bold yellow)%d%C(reset)' --abbrev-commit --date=relative + lg2 = log --graph --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(bold white)— %an%C(reset)' --abbrev-commit + log= 'log' '--decorate' '--pretty=full' + me = $GIT_AUTHOR_NAME + lg = log --pretty=format:'%Cred%h%Creset - %Cgreen(%cr)%Creset%C(yellow)%d%Creset %s %C(bold blue)<%an>%Creset' --abbrev-commit --graph + lg-me = !git lg --author=\"$GIT_AUTHOR_NAME\" + today-all = !git lg --all --since='12am' + lg-day = "!f() { git lg-me --all --after=\"${1-(date \"+%Y-%m-%d\")} 00:00\" --before=\"${1-(date \"+%Y-%m-%d\")} 23:59\"; }; f" + log-grep = "!f() { git log --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' ${1-HEAD..HEAD} | grep ${2-\"Merge pull\"}; }; f" + ribbon = tag --force _ribbon origin/master + catchup = log --patch --reverse --topo-order _ribbon..origin/master + st = 'status' + rb = 'rebase' + f = 'fetch' + pl = 'pull' + ps = 'push' + co = 'checkout' + cod = 'checkout develop' + +[color] + diff = auto + status = auto + branch = auto + interactive = auto + ui = true + pager = true + +[color "branch"] + current = yellow reverse + local = yellow + remote = green + +[color "diff"] + meta = yellow bold + frag = magenta bold + old = red bold + new = green bold + +[color "status"] + added = yellow + changed = green + untracked = cyan + +[difftool] + prompt = false + +[push] + default = current + +[branch] + autosetuprebase = always + +[gpg] + program = /usr/bin/gpg2 + +[tig] + line-graphics = utf-8 + reference-format = (branch) + mouse = yes + +[credential] + helper = !gopass git-credential $@ + +[pull] + rebase = true diff --git a/dot_signature.rubyberlin b/dot_signature.rubyberlin new file mode 100644 index 0000000..556a1ea --- /dev/null +++ b/dot_signature.rubyberlin @@ -0,0 +1,8 @@ + +Ruby Berlin e.V. +Adalbertstr. 7-8 +10999 Berlin +Germany + +E-Mail: info@rubyberlin.org +Web: rubyberlin.org diff --git a/dot_signature.tmpl b/dot_signature.tmpl new file mode 100644 index 0000000..7a1fc3f --- /dev/null +++ b/dot_signature.tmpl @@ -0,0 +1,12 @@ + +Sebastian Schulze + +smtp: mail@{{ .chezmoi.username }}.com +jabber: {{ .chezmoi.username }}@yakshed.org +http: https://{{ .chezmoi.username }}.com +keybase: keybase.io/{{ .chezmoi.username }} + +--- + +Always acknowledge a fault. This will throw those in authority off +their guard and give you an opportunity to commit more. -- Mark Twain