diff options
| author | Felix Lange <fjl@twurst.com> | 2016-03-08 16:32:33 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2016-03-08 16:32:33 +0800 |
| commit | 848e50d6fb94435891cf6e19f29e30d622ddfe9b (patch) | |
| tree | ccf6f9fb9847dce953ca719aaf79dac5f0c6f50f /cmd/geth | |
| parent | bc63a3d282eedc4641def57cfb1c684de580a74b (diff) | |
| parent | 627c2311fb2feaafdd55d444c3c2770d33c5b052 (diff) | |
| download | dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.tar dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.tar.gz dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.tar.bz2 dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.tar.lz dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.tar.xz dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.tar.zst dexon-848e50d6fb94435891cf6e19f29e30d622ddfe9b.zip | |
Merge pull request #2293 from kobigurk/develop
Adds --keystore
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/main.go | 1 | ||||
| -rw-r--r-- | cmd/geth/usage.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 8594d18c5..68e09912b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -284,6 +284,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.GenesisFileFlag, utils.BootnodesFlag, utils.DataDirFlag, + utils.KeyStoreDirFlag, utils.BlockchainVersionFlag, utils.OlympicFlag, utils.FastSyncFlag, diff --git a/cmd/geth/usage.go b/cmd/geth/usage.go index 051c51878..d2f76eaa6 100644 --- a/cmd/geth/usage.go +++ b/cmd/geth/usage.go @@ -63,6 +63,7 @@ var AppHelpFlagGroups = []flagGroup{ Name: "ETHEREUM", Flags: []cli.Flag{ utils.DataDirFlag, + utils.KeyStoreDirFlag, utils.NetworkIdFlag, utils.OlympicFlag, utils.TestNetFlag, |