summaryrefslogtreecommitdiff
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-27 15:38:26 -0800
commit197a80d7d97e5c84e6b8889397aea1cd1d896be5 (patch)
tree065606ba5158deee5431bd86d921c40195970bc3
parent91583a6a8517afd76a78720d8c060d8ad9f03784 (diff)
downloadgit-197a80d7d97e5c84e6b8889397aea1cd1d896be5.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>
-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 0f5d9f92d3..84bff9b447 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -621,10 +621,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]