diff options
| author | Petter Rasmussen | 2016-02-13 01:09:47 +0100 |
|---|---|---|
| committer | Petter Rasmussen | 2016-02-13 01:10:17 +0100 |
| commit | 12e431b5e17ff4ceb6680987bd4649a94b83f896 (patch) | |
| tree | ae18b93e74026fe60f4b02a2be9839e32fc4231d /gdrive.go | |
| parent | 5eae4f159d340d257e41e75604a0fc831cb76381 (diff) | |
| download | gdrive-12e431b5e17ff4ceb6680987bd4649a94b83f896.tar.bz2 | |
Add conflict handling and flags for uploads
Diffstat (limited to 'gdrive.go')
| -rw-r--r-- | gdrive.go | 30 |
1 files changed, 24 insertions, 6 deletions
@@ -440,15 +440,21 @@ func main() { cli.NewFlagGroup("global", globalFlags...), cli.NewFlagGroup("options", cli.BoolFlag{ - Name: "dryRun", - Patterns: []string{"--dry-run"}, - Description: "Show what would have been transferred", + Name: "keepRemote", + Patterns: []string{"--keep-remote"}, + Description: "Keep remote file when a conflict is encountered", OmitValue: true, }, cli.BoolFlag{ - Name: "noProgress", - Patterns: []string{"--no-progress"}, - Description: "Hide progress", + Name: "keepLocal", + Patterns: []string{"--keep-local"}, + Description: "Keep local file when a conflict is encountered", + OmitValue: true, + }, + cli.BoolFlag{ + Name: "keepLargest", + Patterns: []string{"--keep-largest"}, + Description: "Keep largest file when a conflict is encountered", OmitValue: true, }, cli.BoolFlag{ @@ -457,6 +463,18 @@ func main() { Description: "Delete extraneous remote files", OmitValue: true, }, + cli.BoolFlag{ + Name: "dryRun", + Patterns: []string{"--dry-run"}, + Description: "Show what would have been transferred", + OmitValue: true, + }, + cli.BoolFlag{ + Name: "noProgress", + Patterns: []string{"--no-progress"}, + Description: "Hide progress", + OmitValue: true, + }, cli.IntFlag{ Name: "chunksize", Patterns: []string{"--chunksize"}, |