From 4d63577b487a8bf877401312f22142094e2d4584 Mon Sep 17 00:00:00 2001 From: Peter Son Struschka Date: Sat, 12 Jun 2021 23:35:05 +0800 Subject: all: zsh prompt update, general script updates --- git/.config/git/config | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'git/.config') diff --git a/git/.config/git/config b/git/.config/git/config index 5b79b34..1bb1325 100644 --- a/git/.config/git/config +++ b/git/.config/git/config @@ -22,3 +22,9 @@ clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f process = git-lfs filter-process +[pull] + rebase = false +[core] + pager = diff-so-fancy | less -RFX +[init] + defaultBranch = master -- cgit v1.2.3