Autostash option

lib/config.coffee

@@ -100,14 +100,20 @@ module.exports =
         type: "boolean"
         default: false
         description: "Pull with `--rebase` flag?"
-      pullBeforePush:
+      pullAutostash:
         order: 2
+        title: "Pull AutoStash"
+        type: "boolean"
+        default: false
+        description: "Pull with `--autostash` flag?"
+      pullBeforePush:
+        order: 3
         title: "Pull Before Pushing"
         type: "boolean"
         default: false
         description: "Pull from remote before pushing"
       promptForBranch:
-        order: 3
+        order: 4
         title: "Prompt for branch selection when pulling/pushing"
         type: "boolean"
         default: false

lib/models/git-pull.coffee

@@ -4,6 +4,8 @@ RemoteListView = require '../views/remote-list-view'
 
 module.exports = (repo) ->
   extraArgs = if atom.config.get('git-plus.remoteInteractions.pullRebase') then ['--rebase'] else []
+  if atom.config.get('git-plus.remoteInteractions.pullAutostash')
+    extraArgs.push '--autostash'
   if atom.config.get('git-plus.remoteInteractions.promptForBranch')
     git.cmd(['remote'], cwd: repo.getWorkingDirectory())
     .then (data) ->

spec/models/git-pull-spec.coffee

@@ -21,6 +21,25 @@ describe "Git Pull", ->
       GitPull(repo)
       expect(git.cmd).toHaveBeenCalledWith ['remote'], options
 
+  describe "when 'pullRebase' is enabled", ->
+    it 'calls git.cmd with --rebase', ->
+      atom.config.set('git-plus.remoteInteractions.pullRebase', true)
+      GitPull(repo)
+      expect(git.cmd).toHaveBeenCalledWith ['pull', '--rebase', 'origin', 'foo'], options, {color:true}
+
+  describe "when 'pullAutostash' is enabled", ->
+    it 'calls git.cmd with --autostash', ->
+      atom.config.set('git-plus.remoteInteractions.pullAutostash', true)
+      GitPull(repo)
+      expect(git.cmd).toHaveBeenCalledWith ['pull', '--autostash', 'origin', 'foo'], options, {color:true}
+
+  describe "when 'pullRebase' and 'pullAutostash' are enabled", ->
+    it 'calls git.cmd with --rebase and --autostash', ->
+      atom.config.set('git-plus.remoteInteractions.pullRebase', true)
+      atom.config.set('git-plus.remoteInteractions.pullAutostash', true)
+      GitPull(repo)
+      expect(git.cmd).toHaveBeenCalledWith ['pull', '--rebase', '--autostash', 'origin', 'foo'], options, {color:true}
+
   describe "The pull function", ->
     it "calls git.cmd", ->
       _pull repo