summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorYann Dirson <ydirson@altern.org>2009-07-07 20:22:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-07-08 17:42:27 (GMT)
commiteb1f7e0dc0b606bba2af0ec61d4d307f975c83ef (patch)
tree3a36b68b2ef218d4778d2d1ba244d826e2311d2f /Documentation/git-svn.txt
parent6c32a7a99495da3f49e2a142791bc10af3f6f059 (diff)
downloadgit-eb1f7e0dc0b606bba2af0ec61d4d307f975c83ef.zip
git-eb1f7e0dc0b606bba2af0ec61d4d307f975c83ef.tar.gz
git-eb1f7e0dc0b606bba2af0ec61d4d307f975c83ef.tar.bz2
git-svn.txt: fix fetch flags incorrectly documented as init flags.
Signed-off-by: Yann Dirson <ydirson@altern.org> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-svn.txt')
-rw-r--r--Documentation/git-svn.txt21
1 files changed, 11 insertions, 10 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index f40fd42..1e8242b 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -62,16 +62,6 @@ COMMANDS
Set the 'useSvnsyncProps' option in the [svn-remote] config.
--rewrite-root=<URL>;;
Set the 'rewriteRoot' option in the [svn-remote] config.
---use-log-author;;
- When retrieving svn commits into git (as part of fetch, rebase, or
- dcommit operations), look for the first From: or Signed-off-by: line
- in the log message and use that as the author string.
---add-author-from;;
- When committing to svn from git (as part of commit or dcommit
- operations), if the existing log message doesn't already have a
- From: or Signed-off-by: line, append a From: line based on the
- git commit's author string. If you use this, then --use-log-author
- will retrieve a valid author string for all commits.
--username=<USER>;;
For transports that SVN handles authentication for (http,
https, and plain svn), specify the username. For other
@@ -140,6 +130,17 @@ Skip "branches" and "tags" of first level directories;;
------------------------------------------------------------------------
--
+--use-log-author;;
+ When retrieving svn commits into git (as part of fetch, rebase, or
+ dcommit operations), look for the first From: or Signed-off-by: line
+ in the log message and use that as the author string.
+--add-author-from;;
+ When committing to svn from git (as part of commit or dcommit
+ operations), if the existing log message doesn't already have a
+ From: or Signed-off-by: line, append a From: line based on the
+ git commit's author string. If you use this, then --use-log-author
+ will retrieve a valid author string for all commits.
+
'clone'::
Runs 'init' and 'fetch'. It will automatically create a
directory based on the basename of the URL passed to it;