From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 1 May 2011 23:25:01 +0000 (-0700)
Subject: Merge branch 'vh/git-svn-doc'
X-Git-Tag: v1.7.6-rc0~130
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/638e90c235df8af6f560cf672e5038b1f2646ac6?ds=sidebyside;hp=-c

Merge branch 'vh/git-svn-doc'

* vh/git-svn-doc:
git-svn.txt: small typeface improvements
git-svn.txt: move option descriptions
git-svn.txt: fix usage of --add-author-from
---

638e90c235df8af6f560cf672e5038b1f2646ac6
diff --combined Documentation/git-svn.txt
index 71fc0ae8c5,509dc03376..d07f5131aa
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@@ -145,17 -145,6 +145,6 @@@ Skip "branches" and "tags" of first lev
  ------------------------------------------------------------------------
  --
  
- --use-log-author;;
- 	When retrieving svn commits into git (as part of fetch, rebase, or
- 	dcommit operations), look for the first From: or Signed-off-by: line
- 	in the log message and use that as the author string.
- --add-author-from;;
- 	When committing to svn from git (as part of commit or dcommit
- 	operations), if the existing log message doesn't already have a
- 	From: or Signed-off-by: line, append a From: line based on the
- 	git commit's author string.  If you use this, then --use-log-author
- 	will retrieve a valid author string for all commits.
- 
  'clone'::
  	Runs 'init' and 'fetch'.  It will automatically create a
  	directory based on the basename of the URL passed to it;
@@@ -350,8 -339,6 +339,8 @@@ Any other arguments are passed directl
  	Empty directories are automatically recreated when using
  	"git svn clone" and "git svn rebase", so "mkdirs" is intended
  	for use after commands like "git checkout" or "git reset".
 +	(See the svn-remote.<name>.automkdirs config file option for
 +	more information.)
  
  'commit-diff'::
  	Commits the diff of two tree-ish arguments from the
@@@ -574,6 -561,17 +563,17 @@@ repository that will be fetched from
  For 'branch' and 'tag', display the urls that will be used for copying when
  creating the branch or tag.
  
+ --use-log-author::
+ 	When retrieving svn commits into git (as part of 'fetch', 'rebase', or
+ 	'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
+ 	in the log message and use that as the author string.
+ --add-author-from::
+ 	When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit'
+ 	operations), if the existing log message doesn't already have a
+ 	`From:` or `Signed-off-by:` line, append a `From:` line based on the
+ 	git commit's author string.  If you use this, then `--use-log-author`
+ 	will retrieve a valid author string for all commits.
+ 
  
  ADVANCED OPTIONS
  ----------------
@@@ -682,14 -680,6 +682,14 @@@ svn.pathnameencoding:
  	locales to avoid corrupted file names with non-ASCII characters.
  	Valid encodings are the ones supported by Perl's Encode module.
  
 +svn-remote.<name>.automkdirs::
 +	Normally, the "git svn clone" and "git svn rebase" commands
 +	attempt to recreate empty directories that are in the
 +	Subversion repository.  If this option is set to "false", then
 +	empty directories will only be created if the "git svn mkdirs"
 +	command is run explicitly.  If unset, 'git svn' assumes this
 +	option to be "true".
 +
  Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and useSvmProps
  options all affect the metadata generated and used by 'git svn'; they
  *must* be set in the configuration file before any history is imported