dotfiles

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

commit 0fb685433778706b4908621bbe33b1e8c4ae4c81
parent 0045d41d3558d9df16828ce655a74295f088a784
Author: Jake Bauer <jbauer@paritybit.ca>
Date:   Mon, 22 Jun 2020 22:41:43 -0400

Add git pull.rebase setting

Diffstat:
M.config/git/config | 2++
1 file changed, 2 insertions(+), 0 deletions(-)

diff --git a/.config/git/config b/.config/git/config @@ -23,3 +23,5 @@ hist = log --graph --topo-order --date=short --pretty=format:'%C(auto)%h %C(reset)%<(52)%s %C(bold blue)%<(30)%ce %C(reset)%C(green)%cr (%cd) %C(auto)%d' [merge] tool = vimdiff +[pull] + rebase = false