summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-06-16 18:08:01 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-06-16 18:08:01 -0600
commit7e9857b7f08e5a2ea1eae8ff4b6d3ee80bec67ab (patch)
treead67d949a10254c67a90e71c6d235e06b7da58a2
parent6462f0318839ceeda0a8e97bba9441e0b88a57db (diff)
git-rewrite-branch: --svn was in the usage text twice.
-rwxr-xr-xgit-rewrite-branch7
1 files changed, 3 insertions, 4 deletions
diff --git a/git-rewrite-branch b/git-rewrite-branch
index 970229d..6e37cc4 100755
--- a/git-rewrite-branch
+++ b/git-rewrite-branch
@@ -5,7 +5,7 @@
set -eE
-USAGE='[-h|-v|--no-tag|--tag=tag] <in-branch> <out-branch> <filters>...'
+USAGE='[-h|-v|--no-tag|--tag=tag|--svn] <in-branch> <out-branch> <filters>...'
LONG_USAGE='Like filter-branch, but can be used to update branches.
This creates or updates <out-branch> from <in-branch>. If <out-branch> already
@@ -22,13 +22,12 @@ does not need to be edited.
-h Show this text
-v Be more verbose
- --svn Use an existing "git-svn-id" instead of "git-rewrite-id"
- (in-branch was generated by git-svn)
--tag=<tag> Use the exiting <tag> as found in <in-branch>, instead of
the commit hash.
--no-tag Disregard a previous "--tag="; set "git-rewrite-id" to
the commit hash.
- --svn An alias for "--tag=git-svn-id"
+ --svn An alias for "--tag=git-svn-id" (use if <in-branch> was
+ generated by `git-svn`).
<filters> is passed directly to `git filter-branch`, and therefore has the same
format.