[PATCH 3/4] git-svn: Expand documentation for --follow-parent

From

Sebastian Leske <sebastian.leske@sleske.name>

Date

Nov 23, 2012, 07:13 UTC

Message-ID

<a9748faec2a18231ad588c1a2dedb82e74685d74.1353691892.git.Sebastian.Leske@sleske.name>

In-Reply-To

<b115a546fa783b4121d118bb8fdb9270443f90fa.1353691892.git.Sebastian.Leske@sleske.name>

Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name>
---
 Documentation/git-svn.txt |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 928a961..92780ef 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -628,11 +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 (i.e. branched) 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
-	--no-follow-parent to disable it.
+	that has been moved around within the repository (note that you
+	must track both the old and the new name for the whole history
+	to be imported).  If this feature is disabled, the branches
+	created by 'git svn' will all be linaear and not share any
+	history, meaning that there will be no information on where
+	branches where branched off or merged. This feature is enabled
+	by default, use --no-follow-parent to disable it.
 +
 [verse]
 config key: svn.followparent

-- 
1.7.10.4