aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
authorPeter Son Struschka <me@peter-struschka.com>2021-06-12 23:35:05 +0800
committerPeter Son Struschka <me@peter-struschka.com>2021-06-12 23:35:05 +0800
commit4d63577b487a8bf877401312f22142094e2d4584 (patch)
treea35596a5ccda6537b05da0a04a775a85bdc25b06 /git
parenta99b14adcece0b4f42849b5ba229a49d1b17c50d (diff)
downloaddotfiles-4d63577b487a8bf877401312f22142094e2d4584.tar.gz
dotfiles-4d63577b487a8bf877401312f22142094e2d4584.tar.bz2
dotfiles-4d63577b487a8bf877401312f22142094e2d4584.tar.lz
dotfiles-4d63577b487a8bf877401312f22142094e2d4584.tar.xz
dotfiles-4d63577b487a8bf877401312f22142094e2d4584.tar.zst
dotfiles-4d63577b487a8bf877401312f22142094e2d4584.zip
all: zsh prompt update, general script updates
Diffstat (limited to 'git')
-rw-r--r--git/.config/git/config6
1 files changed, 6 insertions, 0 deletions
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