dotfiles

Configuration for the software I use.
git clone https://git.sr.ht/~jbauer/dotfiles
Log | Files | Refs | README | LICENSE

commit 56ee0b9fc6f9d253a116b83672f16702d9753b99
parent 3327ef6ecc8f1e1171f7cd8db43ea71c0d580fec
Author: Jake Bauer <jbauer@paritybit.ca>
Date:   Sat, 16 Oct 2021 04:04:02 -0400

Update git config

Diffstat:
M.config/git/config | 11+++++------
1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.config/git/config b/.config/git/config @@ -1,5 +1,6 @@ [core] - editor = vi + editor = vim + autocrlf = input [user] email = jbauer@paritybit.ca name = Jake Bauer @@ -8,6 +9,7 @@ smtpuser = jbauer smtpencryption = tls smtpserverport = 587 + annotate = yes [alias] co = checkout sw = switch @@ -21,13 +23,10 @@ u = unstage a = add hist = log --graph --topo-order --date=short --pretty=format:'%C(auto)%h %C(reset)%<(52)%s %C(bold blue)%<(30)%ae %C(reset)%C(green)%cr (%cd) %C(auto)%d' -[diff] - tool = vimdiff -[merge] - tool = vimdiff [pull] - rebase = false + rebase = true [push] + default = simple followTags = true [init] defaultBranch = release