Merge pull request #730 from randy3k/pullrebase

Feature: add git pull with rebase command

Default.sublime-commands

@@ -129,6 +129,11 @@
         "caption": "git: pull",
         "command": "gs_pull"
     },
+    {
+        "caption": "git: pull with rebase",
+        "command": "gs_pull",
+        "args": { "rebase": true }
+    },
     {
         "caption": "git: push",
         "command": "gs_push"

core/commands/pull.py

@@ -11,8 +11,9 @@ class GsPullCommand(WindowCommand, GitCommand):
     Through a series of panels, allow the user to pull from a remote branch.
     """
 
-    def run(self, local_branch_name=None):
+    def run(self, local_branch_name=None, rebase=False):
         self.local_branch_name = local_branch_name
+        self.rebase = rebase
         sublime.set_timeout_async(self.run_async)
 
     def run_async(self):
@@ -91,6 +92,6 @@ def do_pull(self, remote, branch, remote_branch):
         Perform `git pull remote branch`.
         """
         sublime.status_message("Starting pull...")
-        self.pull(remote=remote, branch=branch, remote_branch=remote_branch)
+        self.pull(remote=remote, branch=branch, remote_branch=remote_branch, rebase=self.rebase)
         sublime.status_message("Pull complete.")
         util.view.refresh_gitsavvy(self.window.active_view())

core/git_mixins/remotes.py

@@ -42,13 +42,14 @@ def list_remote_branches(self, remote=None):
         # Remove any duplicate branch names.
         return [branch for idx, branch in enumerate(branches) if branches.index(branch) == idx]
 
-    def pull(self, remote=None, branch=None, remote_branch=None):
+    def pull(self, remote=None, branch=None, remote_branch=None, rebase=False):
         """
         Pull from the specified remote and branch if provided, otherwise
         perform default `git pull`.
         """
         self.git(
             "pull",
+            "--rebase" if rebase else None,
             remote,
             branch if not remote_branch else "{}:{}".format(remote_branch, branch)
             )

docs/remotes.md

@@ -14,6 +14,10 @@ Assuming you've recently fetched, this command allows you to create a local bran
 
 When running this command, you will be prompted first for the remote you want to pull from, and then the branch.  If your local branch tracks a remote, that branch name will be pre-selected at the second prompt.
 
+## `git: pull with rebase`
+
+Like `git: pull`, but rebasing on the remote branch instead of merging.
+
 **For the following commands you need to configure a username and password in git, so GitSavvy can use it.**
 
 ## `git: push`