From 8bcbb80f04c0cf07ea5256cadcc61010a1167a41 Mon Sep 17 00:00:00 2001 From: Daniel Yrovas Date: Wed, 23 Mar 2022 20:54:32 +1100 Subject: [PATCH] git dotfiles --- .config/git/config | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .config/git/config diff --git a/.config/git/config b/.config/git/config new file mode 100644 index 0000000..074f858 --- /dev/null +++ b/.config/git/config @@ -0,0 +1,50 @@ +[user] + name = Daniel Yrovas + email = dan@danielyrovas.com + signingkey = C181BAC70BDE7C00 +[init] + defaultBranch = trunk +[ui "color"] + ui = always +[color] + ui = true +[core] + safecrlf = false +[merge] + tool = nvim -d +[alias] + c = commit + cm = commit -m '$2' && git push + s = status + st = status -u + lg = log --oneline + last = log -1 HEAD + cl = log -p -- ':(exclude)Cargo.lock' + f = push --force-with-lease + # https://stackoverflow.com/a/11688523/472927 + ss = "!f() { git stash show stash^{/$*} -p; }; f" + sa = "!f() { git stash apply stash^{/$*}; }; f" + sl = stash list + alias = ! git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ / +[pull] + ff = only +[push] + default = simple +[help] + autocorrect = 1 +[url "git@github.com:"] + insteadOf = gh: +[github] + user = danielyrovas +[diff] + algorithm = patience + compactionHeuristic = true +[commit] + gpgsign = true +[protocol] + version = 2 +[sendemail] + smtpserver = /usr/bin/msmtp + annotate = yes +[diff "odf"] + textconv = odt2txt