From 76656c319bd9b9a48956ec1da11c4f34cea919cf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 9 Nov 2006 23:35:58 +0000 Subject: [PATCH] Autogenerated man pages for v1.4.4-rc1-g368c --- man1/git-svn.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/man1/git-svn.1 b/man1/git-svn.1 index c8af0c69e..7ec0b8212 100755 --- a/man1/git-svn.1 +++ b/man1/git-svn.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GIT\-SVN" "1" "10/12/2006" "" "" +.TH "GIT\-SVN" "1" "11/09/2006" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -86,7 +86,7 @@ Not a part of daily usage, but this is a useful command if you've just cloned a Recursively finds and lists the svn:ignore property on directories. The output is suitable for appending to the $GIT_DIR/info/exclude file. .TP \fIcommit\-diff\fR -Commits the diff of two tree\-ish arguments from the command\-line. This command is intended for interopability with git\-svnimport and does not rely on being inside an git\-svn init\-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a git\-svn\-aware repository (that has been init\-ed with git\-svn). +Commits the diff of two tree\-ish arguments from the command\-line. This command is intended for interopability with git\-svnimport and does not rely on being inside an git\-svn init\-ed repository. This command takes three arguments, (a) the original tree to diff against, (b) the new tree result, (c) the URL of the target Subversion repository. The final argument (URL) may be omitted if you are working from a git\-svn\-aware repository (that has been init\-ed with git\-svn). The \-r option is required for this. .TP \fIgraft\-branches\fR This command attempts to detect merges/branches from already imported history. Techniques used currently include regexes, file copies, and tree\-matches). This command generates (or modifies) the $GIT_DIR/info/grafts file. This command is considered experimental, and inherently flawed because merge\-tracking in SVN is inherently flawed and inconsistent across different repositories. -- 2.26.2