diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-03 19:52:58 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2016-05-03 19:52:58 +0800 |
| commit | d52a693f802ce4445cc02a879646ca5466fb2a06 (patch) | |
| tree | 0e3a017c071c8996d7470f5477087ee201ce2da2 /cmd/geth/usage.go | |
| parent | 8241fa522772837f0d05511f20caa6da1d5a3209 (diff) | |
| parent | 258cc73ea970890a5b75bf27197c3a6667f3bc5a (diff) | |
| download | go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.gz go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.bz2 go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.lz go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.xz go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.tar.zst go-tangerine-d52a693f802ce4445cc02a879646ca5466fb2a06.zip | |
Merge branch 'develop' into release/1.4
Conflicts:
cmd/geth/main.go
Diffstat (limited to 'cmd/geth/usage.go')
| -rw-r--r-- | cmd/geth/usage.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 278a55980..90019d7b9 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -150,8 +150,11 @@ var AppHelpFlagGroups = []flagGroup{ }, }, { - Name: "LOGGING AND DEBUGGING", - Flags: append([]cli.Flag{utils.MetricsEnabledFlag}, debug.Flags...), + Name: "LOGGING AND DEBUGGING", + Flags: append([]cli.Flag{ + utils.MetricsEnabledFlag, + utils.FakePoWFlag, + }, debug.Flags...), }, { Name: "EXPERIMENTAL", |