From 40e4290910209de4e8d9a1c65575846486d2db80 Mon Sep 17 00:00:00 2001
From: Jeff Geerling <geerlingguy@mac.com>
Date: Tue, 25 May 2021 21:13:20 -0500
Subject: [PATCH] A couple tiny tweaks.

---
 .gitconfig | 2 ++
 .zshrc     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitconfig b/.gitconfig
index 125c072..e4717f0 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -28,3 +28,5 @@
   d = diff
   dc = diff --cached
   l = log --graph --pretty=format:"%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset" --abbrev-commit
+[pull]
+	rebase = true
diff --git a/.zshrc b/.zshrc
index 0021c53..2c270bd 100644
--- a/.zshrc
+++ b/.zshrc
@@ -13,7 +13,7 @@ export CLICOLOR_FORCE=1
 unsetopt nomatch
 
 # Nicer prompt.
-export PS1=$'\n'"%F{green} %*%F %3~ %F{white}$ "
+export PS1=$'\n'"%F{green} %*%F %3~ %F{white}"$'\n'"$ "
 
 # Enable plugins.
 plugins=(git brew history kubectl history-substring-search)