Merge pull request #18 from randallreedjr/releases/1.1.3

v1.1.3

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_swap (1.1.2)
+    git_swap (1.1.3)
       activesupport (~> 5.2)
 
 GEM

README.md

@@ -83,7 +83,8 @@ git swap personal -v
 
 ## Releasing
 To release a new version of the gem:
-* Once changes for release have been merged into `develop` branch, create a new release branch (`releases/vx.y.z`) off `develop`.
+* Once changes for release have been merged into `develop` branch, merge the `develop` branch into `master`.
+* Create a new release branch (`releases/vx.y.z`) off `master`.
 * Bump the version number in [lib/git_swap/version.rb](https://github.com/randallreedjr/git_swap/blob/develop/lib/git_swap/version.rb).
 * Rerun `bundle` to update Gemfile.lock
 * Open a pull request to the `master` branch

lib/git_swap/swapper.rb

@@ -80,10 +80,11 @@ def set_git_config
 
     def set_ssh
       `git config #{git_config_flag} core.sshCommand "#{ssh_command}"`
+      # Include the --apple-use-keychain option to retrieve the passphrase
       if options.verbose?
-        `ssh-add #{ssh}`
+        `ssh-add --apple-use-keychain #{ssh}`
       else
-        `ssh-add #{ssh} 2>/dev/null`
+        `ssh-add --apple-use-keychain #{ssh} 2>/dev/null`
       end
     end
 

lib/git_swap/version.rb

@@ -1,3 +1,3 @@
 module GitSwap
-  VERSION = "1.1.2" unless defined? VERSION
+  VERSION = "1.1.3" unless defined? VERSION
 end