summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Gerrand <adg@golang.org>2014-12-03 10:50:28 +1100
committerAndrew Gerrand <adg@golang.org>2014-12-03 10:50:28 +1100
commit848a10529c669d5334a093fdb087a541e3df4f9a (patch)
treeb51b69364c9e8ddba8a0a8ed787645527ac27671
parentd584311484e2ee03cf02a1f956c1c5eb7a5467d5 (diff)
downloadgo-848a10529c669d5334a093fdb087a541e3df4f9a.tar.gz
[release-branch.go1.4] cmd/go: regenerate doc.go
??? CL 183000043 / 871468f5ceaf cmd/go: regenerate doc.go Move change from CL 170770043 to correct file and regenerate docs for changes from CL 164120043. LGTM=adg R=golang-codereviews, adg, bradfitz CC=golang-codereviews https://codereview.appspot.com/183000043 Committer: Andrew Gerrand <adg@golang.org> ??? LGTM=minux R=bradfitz, minux CC=golang-codereviews https://codereview.appspot.com/181490043
-rw-r--r--src/cmd/go/doc.go7
-rw-r--r--src/cmd/go/generate.go2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/cmd/go/doc.go b/src/cmd/go/doc.go
index 43a315944..879fc7f8b 100644
--- a/src/cmd/go/doc.go
+++ b/src/cmd/go/doc.go
@@ -317,7 +317,7 @@ Download and install packages and dependencies
Usage:
- go get [-d] [-fix] [-t] [-u] [build flags] [packages]
+ go get [-d] [-f] [-fix] [-t] [-u] [build flags] [packages]
Get downloads and installs the packages named by the import paths,
along with their dependencies.
@@ -325,6 +325,11 @@ along with their dependencies.
The -d flag instructs get to stop after downloading the packages; that is,
it instructs get not to install the packages.
+The -f flag, valid only when -u is set, forces get -u not to verify that
+each package has been checked out from the source control repository
+implied by its import path. This can be useful if the source is a local fork
+of the original.
+
The -fix flag instructs get to run the fix tool on the downloaded packages
before resolving dependencies or building the code.
diff --git a/src/cmd/go/generate.go b/src/cmd/go/generate.go
index a83cce8f7..2772452dd 100644
--- a/src/cmd/go/generate.go
+++ b/src/cmd/go/generate.go
@@ -45,7 +45,7 @@ The arguments are space-separated tokens or double-quoted strings
passed to the generator as individual arguments when it is run.
Quoted strings use Go syntax and are evaluated before execution; a
-quoted string appears a single argument to the generator.
+quoted string appears as a single argument to the generator.
Go generate sets several variables when it runs the generator: