Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clashes: more notes about -fix-mode trash #815

Merged
merged 1 commit into from
Jan 24, 2017
Merged

clashes: more notes about -fix-mode trash #815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,7 +1083,7 @@ drive clashes -fix [-fix-mode mode] [-depth n] [paths...]

There are two available modes for `-fix-mode`:
* `rename`: this is the default behavior
* `trash`
* `trash`: trashing *both* new and old files

### Move

Expand Down
2 changes: 1 addition & 1 deletion src/clashes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ func autoTrashClashes(g *Commands, clashes []*Change) error {
}

if g.opts.canPrompt() {
g.log.Logln("Some clashes found, trash them?")
g.log.Logln("Some clashes found, trash them all?")
for _, c := range clashes {
g.log.Logln(c.Symbol(), c.Path, c.Dest.Id)
}
Expand Down
2 changes: 1 addition & 1 deletion src/help.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const (
DescOpen = "open a file in the appropriate filemanager or default browser"
DescUrl = "returns the remote URL of each file"
DescVerbose = "show step by step information verbosely"
DescFixClashes = "fix clashes by renaming or trashing files"
DescFixClashes = "fix clashes by renaming or trashing all files"
DescFixClashesMode = "set fix policy to rename or trash"
DescListClashes = "list clashes"
DescDescription = "set the description"
Expand Down