diff --git a/Library/Homebrew/dev-cmd/man.rb b/Library/Homebrew/dev-cmd/man.rb index 587e44b0e9359518b2139c8c6fb5cbde3b22af75..9f3fca487553bd799f22cffdc7cf85846c6d0cab 100644 --- a/Library/Homebrew/dev-cmd/man.rb +++ b/Library/Homebrew/dev-cmd/man.rb @@ -195,6 +195,9 @@ module Homebrew line = line.slice(4..-1) next unless line + # Omit the common global_options documented separately in the man page. + next if line =~ /--(debug|force|help|quiet|verbose) / + # Format one option or a comma-separated pair of short and long options. lines << line.gsub(/^ +(-+[a-z-]+), (-+[a-z-]+) +/, "* `\\1`, `\\2`:\n ") .gsub(/^ +(-+[a-z-]+) +/, "* `\\1`:\n ") diff --git a/docs/Manpage.md b/docs/Manpage.md index 9bb1e9789d72fc19de2ad127c9f4d07cdde4dc89..948500a123a050d82cda8033e1421d874a2e180e 100644 --- a/docs/Manpage.md +++ b/docs/Manpage.md @@ -540,9 +540,6 @@ Fetch the newest version of Homebrew and all formulae from GitHub using `git`(1) * `--merge`: `git merge` is used to include updates (rather than `git rebase`). -* `--force`: - Always do a slower, full update check (even if unnecessary). - ### `update-reset` [*`repository`*] Fetches and resets Homebrew and all tap repositories (or any specified `repository`) using `git`(1) to their latest `origin/master`. Note this will destroy all your uncommitted or committed changes. diff --git a/manpages/brew.1 b/manpages/brew.1 index f15edcf778ee0008835fdd0147abb35c14cfd1d8..86758337517c939312f1e2dc8f526cb4189ec373 100644 --- a/manpages/brew.1 +++ b/manpages/brew.1 @@ -660,10 +660,6 @@ Fetch the newest version of Homebrew and all formulae from GitHub using \fBgit\f \fB\-\-merge\fR \fBgit merge\fR is used to include updates (rather than \fBgit rebase\fR)\. . -.TP -\fB\-\-force\fR -Always do a slower, full update check (even if unnecessary)\. -. .SS "\fBupdate\-reset\fR [\fIrepository\fR]" Fetches and resets Homebrew and all tap repositories (or any specified \fBrepository\fR) using \fBgit\fR(1) to their latest \fBorigin/master\fR\. Note this will destroy all your uncommitted or committed changes\. .