dotfiles

commit e7308ac456f17910cb07627ccf5fefdc9ae0be23
parent c531a65a82b80b4c2ba56c03c1580c2a0a098a39
Author: Alex Balgavy <a.balgavy@gmail.com>
Date:   Mon, 14 Oct 2019 23:03:17 -0400

git-pull-menu: pull rebase, not just rebase

Former-commit-id: de29d8c3d5bbf462f95181c9b6ef30ca8a58866f
Diffstat:
M
scripts/git-pull-menu
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/git-pull-menu b/scripts/git-pull-menu
@@ -6,7 +6,7 @@ if ! git pull --ff-only; then
     upstream="$(git branch -r | grep -v HEAD | tr -d ' ')"
     case $action in
       Rebase)
-        git rebase "$upstream"
+        git pull --rebase "$upstream"
         break;;
       Merge)
         git merge "$upstream"