josh/jsvn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stash: update README for stash rework

Browse Source
This commit is contained in:
Josh Holtrop 2013-03-11 22:12:36 -04:00
parent f2678b5f88
commit 821d27863d
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
README
View File

@ -56,27 +56,34 @@ Implemented subcommands:
- revert all affected files under given target path(s) - revert all affected files under given target path(s)
root root
- output root URL (for use on shell such as "svn log $(svn root)/tags") - output root URL (for use on shell such as "svn log $(svn root)/tags")
stash [command] stash [options] [file...]
- allow temporarily saving changes to the working copy without committing - allow temporarily saving changes to the working copy without committing
- the stashes behaves as a "stack" where "save" pushes a new stash object - the stashes behaves as a "stack" where stashing pushes a new stash object
and "pop" pops the newest one from the top of the stack and popping removes the newest one from the top of the stack
commands: - binary files are ignored (a warning is printed) and not stashed
save [-k] (default if not specified): options:
- save changes as a "stash" object -e, --externals
- revert changes from working copy unless -k (keep working copy) given - also stash changes in externals (if no explicit targets given)
- this only works with text files, not binary files -k, --keep
list: - create the stash object, but keep the changes locally as well
- with --pop, do not remove the stash object after reapplying it
-p, --patch
- interactively prompt for whether to stash each hunk
--list
- show a list of all stash objects - show a list of all stash objects
pop [-k] [id]: --pop [id]
- apply the stash object <id> back to the working copy - apply the stash object <id> back to the working copy
- the stash object is removed unless -k (keep) given - the stash object is removed unless -k (keep) given
- <id> defaults to the newest stash object created - <id> defaults to the newest stash object created
show [id]: --show [id]
- display the diff stored in stash with ID <id> - display the diff stored in stash with ID <id>
- <id> defaults to the newest stash object created - <id> defaults to the newest stash object created
drop [id]: --drop [id]
- delete stash object <id> - delete stash object <id>
- <id> defaults to the newest stash object created - <id> defaults to the newest stash object created
- if none of --list, --pop, --show, or --drop is given, a new stash object
is created containing the chosen differences
- if file is given, only the changes from the listed files will be stashed
switch <short_name> switch <short_name>
- switch to 'trunk', branch name, or tag name without having to specify - switch to 'trunk', branch name, or tag name without having to specify
the full URL the full URL