summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorSebastian Leske <Sebastian.Leske@sleske.name>2012-11-30 08:16:30 +0100
committerJunio C Hamano <gitster@pobox.com>2012-12-05 14:39:55 -0800
commit0d35bfe1beb7e6254742b2c1d0fb002abdfab8e9 (patch)
tree742c6c50a7e800c658b6bd4e8ed37f579d166110 /Documentation/git-svn.txt
parent92166fd7b4538029d60ceb1ce2065f85b8186a70 (diff)
downloadgit-0d35bfe1beb7e6254742b2c1d0fb002abdfab8e9.tar.gz
git-svn: Expand documentation for --follow-parent
Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> 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.txt15
1 files changed, 12 insertions, 3 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 7eec8d8da5..b3c812ffef 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -628,10 +628,19 @@ ADVANCED OPTIONS
Default: "svn"
--follow-parent::
+ This option is only relevant if we are tracking branches (using
+ one of the repository layout options --trunk, --tags,
+ --branches, --stdlayout). For each tracked branch, try to find
+ out where its revision was copied from, and set
+ a suitable parent in the first git commit for the branch.
This is especially helpful when we're tracking a directory
- that has been moved around within the repository, or if we
- started tracking a branch and never tracked the trunk it was
- descended from. This feature is enabled by default, use
+ that has been moved around within the repository. If this
+ feature is disabled, the branches created by 'git svn' will all
+ be linear and not share any history, meaning that there will be
+ no information on where branches were branched off or merged.
+ However, following long/convoluted histories can take a long
+ time, so disabling this feature may speed up the cloning
+ process. This feature is enabled by default, use
--no-follow-parent to disable it.
+
[verse]