Merge branch 'mg/maint-pull-suggest-upstream-to'

gitster · gitster · commit 159a5a2fa2b5 · 2012-11-15T10:24:59.000-08:00
Follow-on to the new "--set-upstream-to" topic from v1.8.0 to avoid
suggesting the deprecated "--set-upstream".

* mg/maint-pull-suggest-upstream-to:
  push/pull: adjust missing upstream help text to changed interface
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
@@ -80,7 +80,7 @@ See git-${cmd}(1) for details
 
 If you wish to set tracking information for this branch you can do so with:
 
-    git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>
+    git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}
 "
 	fi
 	exit 1

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ See git-${cmd}(1) for details`
`80`	`80`
`81`	`81`	`If you wish to set tracking information for this branch you can do so with:`
`82`	`82`
`83`		`- git branch --set-upstream ${branch_name#refs/heads/} $remote/<branch>`
	`83`	`+ git branch --set-upstream-to=$remote/<branch> ${branch_name#refs/heads/}`
`84`	`84`	`"`
`85`	`85`	`fi`
`86`	`86`	`exit 1`