close #200 workon should not pull rebase

groenborg · groenborg · commit 7975c02619f6 · 2017-08-21T14:21:15.000+02:00
diff --git a/phlow/workon.go b/phlow/workon.go
@@ -21,7 +21,7 @@ func WorkOn(issue int) {
 	ui.PhlowSpinner.Start("Setting up workspace")
 	defer ui.PhlowSpinner.Stop()
 
-	if _, err := git.Pull("--rebase"); err != nil {
+	if _, err := git.Fetch("--all"); err != nil {
 		fmt.Println(err)
 		return
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func WorkOn(issue int) {`
`21`	`21`	`ui.PhlowSpinner.Start("Setting up workspace")`
`22`	`22`	`defer ui.PhlowSpinner.Stop()`
`23`	`23`
`24`		`- if _, err := git.Pull("--rebase"); err != nil {`
	`24`	`+ if _, err := git.Fetch("--all"); err != nil {`
`25`	`25`	`fmt.Println(err)`
`26`	`26`	`return`
`27`	`27`	`}`