Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske <sebastian.leske@xxxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html