diff --git a/README b/README index dbb6a34..ac7a97d 100644 --- a/README +++ b/README @@ -2,8 +2,8 @@ Josh's SVN wrapper script This wrapper script to Subversion supplements normal svn behavior by adding additional functionality or modifying the output of the default -svn subcommands. Much of the functionality implemented here was inspired -by the way that git works. +svn subcommands (simplification and colorization). Much of the functionality +implemented here was inspired by the way that git works. It is recommended to put this script in your $PATH as 'jsvn' or something other than 'svn' and to make an alias svn='jsvn'. @@ -27,6 +27,11 @@ Implemented subcommands: - with -d, delete - otherwise, create a new branch from the current one - also switch to the new branch if -s is given + diff + - allow specifying ref1..ref2 syntax to show the diff between two references + - references can be tag names, branch names, or 'trunk' + - allow specifying ref1...ref2 syntax to show the diff between the common + ancestor of ref1 and ref2 and ref2's HEAD tag[s] [[-d] ] | [-m ] - with no arguments, list tags - with -d, delete @@ -36,6 +41,9 @@ Implemented subcommands: - switch to 'trunk', branch name, or tag name without having to specify the full URL - falls back to Subversion "switch" if doesn't exist + log + - allow specifying ref1..ref2 syntax to show the log entries for + ref2 which are not a part of ref1 merge - merge branch into the current WC path - falls back to Subversion "merge" if doesn't exist @@ -79,13 +87,6 @@ Implemented subcommands: - delete stash object - defaults to the newest stash object created -The following subcommands are executed using their native handler, but -have their output simplified and/or colorized: - - diff - - log - - status - - update - If the subcommand name begins with two leading underscores ("__"), the underscores will be stripped and the command will be handled by native Subversion without any jsvn processing.