commit 8722641fe498a651273e539e7b422f3c5e2262ef
author Matt Butcher <technosophos@gmail.com> Mon Aug 11 16:07:41 2014 -0600
committer Matt Butcher <technosophos@gmail.com> Mon Aug 11 16:07:41 2014 -0600
tree cfda671b328ffa0231671373236b6bc05dd86cf4
parent 44eff51b406a46431cddf1c0ff82cade888cc9e9

Experimenting with using git pull instead of git merge.

cmd/git.go

diff --git a/cmd/git.go b/cmd/git.go
index 9ad81a7..8f6868a 100644
--- a/cmd/git.go
+++ b/cmd/git.go
@@ -85,8 +85,8 @@
 		//Info("Git: Found branch %s", string(out))
 		//Debug("Reference %s is to a branch.", dep.Reference)
 		// git merge --ff-only origin $VERSION
-		out, err := exec.Command("git", "merge", "--ff-only", "origin", dep.Reference).CombinedOutput()
-		Info("Git: %s", string(out))
+		out, err := exec.Command("git", "pull", "--ff-only", "origin", dep.Reference).CombinedOutput()
+		Info("Git: (merge) %s", string(out))
 		if err != nil {
 			return err
 		}