Skip to content

Commit c88d18f

Browse files
escgitster
authored andcommitted
git-svn.txt: move option descriptions
The options '---use-log-author' and '--add-author-from' are applicable to other subcommands except 'fetch' -- therefore move them from the 'fetch' section to the more general 'options' section. Signed-off-by: Valentin Haenel <[email protected]> Acked-by: Eric Wong <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 12d3065 commit c88d18f

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

Documentation/git-svn.txt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -145,17 +145,6 @@ Skip "branches" and "tags" of first level directories;;
145145
------------------------------------------------------------------------
146146
--
147147

148-
--use-log-author;;
149-
When retrieving svn commits into git (as part of fetch, rebase, or
150-
dcommit operations), look for the first From: or Signed-off-by: line
151-
in the log message and use that as the author string.
152-
--add-author-from;;
153-
When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit'
154-
operations), if the existing log message doesn't already have a
155-
From: or Signed-off-by: line, append a From: line based on the
156-
git commit's author string. If you use this, then --use-log-author
157-
will retrieve a valid author string for all commits.
158-
159148
'clone'::
160149
Runs 'init' and 'fetch'. It will automatically create a
161150
directory based on the basename of the URL passed to it;
@@ -572,6 +561,17 @@ repository that will be fetched from.
572561
For 'branch' and 'tag', display the urls that will be used for copying when
573562
creating the branch or tag.
574563

564+
--use-log-author::
565+
When retrieving svn commits into git (as part of fetch, rebase, or
566+
dcommit operations), look for the first From: or Signed-off-by: line
567+
in the log message and use that as the author string.
568+
--add-author-from::
569+
When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit'
570+
operations), if the existing log message doesn't already have a
571+
From: or Signed-off-by: line, append a From: line based on the
572+
git commit's author string. If you use this, then --use-log-author
573+
will retrieve a valid author string for all commits.
574+
575575

576576
ADVANCED OPTIONS
577577
----------------

0 commit comments

Comments
 (0)