From 448c81b495a8867297ad491a186371d9dda80515 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 3 Mar 2006 01:20:09 -0800 Subject: contrib/git-svn: better documenting of CLI switches Also, fix a asciidoc formatting error Signed-off-by: Eric Wong Signed-off-by: Junio C Hamano --- contrib/git-svn/git-svn.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'contrib/git-svn/git-svn.txt') diff --git a/contrib/git-svn/git-svn.txt b/contrib/git-svn/git-svn.txt index 7306048bff..8e9a971a85 100644 --- a/contrib/git-svn/git-svn.txt +++ b/contrib/git-svn/git-svn.txt @@ -116,6 +116,8 @@ OPTIONS They are both passed directly to git-diff-tree see git-diff-tree(1) for more information. +ADVANCED OPTIONS +---------------- -b:: --branch :: Used with 'fetch' or 'commit'. @@ -131,8 +133,21 @@ OPTIONS This option may be specified multiple times, once for each branch. +-i:: +--id :: + This sets GIT_SVN_ID (instead of using the environment). See + the section on "Tracking Multiple Repositories or Branches" for + more information on using GIT_SVN_ID. + COMPATIBILITY OPTIONS --------------------- +--upgrade:: + Only used with the 'rebuild' command. + + Run this if you used an old version of git-svn that used + 'git-svn-HEAD' instead of 'remotes/git-svn' as the branch + for tracking the remote. + --no-ignore-externals:: Only used with the 'fetch' and 'rebuild' command. @@ -177,7 +192,7 @@ Tracking and contributing to an Subversion managed-project: git-svn commit remotes/git-svn..my-branch # Something is committed to SVN, pull the latest into your branch:: git-svn fetch && git pull . remotes/git-svn -# Append svn:ignore settings to the default git exclude file: +# Append svn:ignore settings to the default git exclude file:: git-svn show-ignore >> .git/info/exclude DESIGN PHILOSOPHY -- cgit v1.2.1