From 79a3df47aa9b310c84ac26875a03c5aa563de018 Mon Sep 17 00:00:00 2001 From: Andrew Gerrand Date: Wed, 3 Dec 2014 10:50:28 +1100 Subject: [PATCH] [release-branch.go1.4] cmd/go: regenerate doc.go MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit ««« 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://golang.org/cl/183000043 »»» LGTM=minux R=bradfitz, minux CC=golang-codereviews https://golang.org/cl/181490043 --- src/cmd/go/doc.go | 7 ++++++- src/cmd/go/generate.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/cmd/go/doc.go b/src/cmd/go/doc.go index 43a3159440..879fc7f8ba 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 a83cce8f7a..2772452dd5 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: -- 2.48.1