Skip to content

Commit

Permalink
Update the docs.
Browse files Browse the repository at this point in the history
  • Loading branch information
m-hall committed Mar 22, 2015
1 parent 7582218 commit 5194f1e
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
9 changes: 4 additions & 5 deletions HypnotoadSVN.sublime-settings
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,10 @@
// "cleanup": "nativeSVN",
// "lock": "nativeSVN",
// "unlock": "nativeSVN",

// Right now these commands are only supported in tortoise
// "resolve": "tortoiseSVN",
// "switch": "tortoiseSVN",
// "branch": "tortoiseSVN",
// "resolve": "nativeSVN",
// "switch": "nativeSVN",
// "branch": "nativeSVN",
// "merge": "nativeSVN",
// "checkout": "nativeSVN"
}
}
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ This plugin started from [dexbol/sublime-TortoiseSVN](https://github.com/dexbol/
- Support for using TortoiseSVN on Windows
- Wide array of commands supported
- Command history
- Customizable Side Bar

### Future
- Support for more native commands
- Specify external program for diff/blame/etc.
- Improve interface for some commands
- Folder diffs

##Requirements
Expand Down
19 changes: 17 additions & 2 deletions docs/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,24 @@ By default, all commands use the default, except for diff and blame, which prefe
- unlock
- diff
- blame

#### Unsupported commands
- resolve
- switch
- branch
- merge
- checkout

## Project Settings
All settings can also be added to the project files. While inside the project, these settings will overwrite the global settings on a case by case basis, so you won't have to copy all settings into each new project.
In the project file, group all settings in the "HypnotoadSVN" object.

### Branches
Branches can only be added to project settings. They are currently not accessible via global settings.
Branches will also automatically be added to you project settings as they are used.
When you are not in a project, branches must be manually entered each

```Javascript
"branches": [
'http://source.url/svn/trunk',
'http://source.url/svn/branches/my_branch'
]
```

0 comments on commit 5194f1e

Please sign in to comment.