From 22f82993bd18a18186c142831835e81cfa4eb1b4 Mon Sep 17 00:00:00 2001
From: Mike Gerwitz <mike@mikegerwitz.com>
Date: Wed, 18 Jun 2014 10:30:30 -0400
Subject: [PATCH] `Pr` and `Prp` shortmaps will now preserves merges

---
 README.md | 4 ++--
 shortmaps | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 3318301..7d7e094 100644
--- a/README.md
+++ b/README.md
@@ -39,8 +39,8 @@ By default, the following mappings are available, each with tab completion:
 * `ma` - git merge --abort
 * `p` - git push
 * `P` - git pull
-* `Pr` - git pull --rebase
-* `Prp` - git pull --rebase && git push
+* `Pr` - git pull --rebase=preserve
+* `Prp` - git pull --rebase=preserve && git push
 * `R` - git rebase
 * `Ri` - git rebase --interactive
 * `Ra` - git rebase --abort
diff --git a/shortmaps b/shortmaps
index 5c405fd..69098fb 100644
--- a/shortmaps
+++ b/shortmaps
@@ -18,8 +18,8 @@ m _git_merge :merge
 ma : :merge --abort
 p _git_push :push
 P _git_pull :pull
-Pr _git_pull :pull --rebase
-Prp _git_pull |git pull --rebase && git push
+Pr _git_pull :pull --rebase=preserve
+Prp _git_pull |git pull --rebase=preserve && git push
 R __git_rebase :rebase
 Ri _git_rebase :rebase --interactive
 Ra _git_rebase :rebase --abort