urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-08 14:09:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'claydoc-cancel', remote-tracking branch 'dhaffey/spinner'

Browse Source 
Add |cancel to clay doc (closes #579)
Add a spinner while events happen (closes #599)
This commit is contained in:
Raymond Pasco 2015-12-16 10:54:40 -05:00
commit f68d66b4b3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pub/docs/user/clay.md
View File

@ -416,3 +416,13 @@ trusted to provide updates. Sometimes, it's useful to sync two
desks to each other, so that changes to one or the other are desks to each other, so that changes to one or the other are
mirrored. Cyclical sync structures are normal and healthy. mirrored. Cyclical sync structures are normal and healthy.
Also, one desk can be the target of multiple autosyncs. Also, one desk can be the target of multiple autosyncs.
### Cancelling a merge
Sometimes you start a merge that isn't going to finish quickly
enough to suit your taste. If you find yourself in this awkward
position,
|cancel %local-desk
will get you out of it.