summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-08-02 15:38:55 -0700
committerJunio C Hamano <gitster@pobox.com>2010-08-02 15:38:55 -0700
commite7bdd1b90bb37139b37683aa306a9e161cb9e6ce (patch)
tree7de9fb5a55c5840989d1209b6362404849ef79cb /Documentation
parent9f9aa761305e909aca9a46ccb33a5872b36bcb8e (diff)
parent181264ad590ffef9d956fdd023369869c2d0a55f (diff)
downloadgit-e7bdd1b90bb37139b37683aa306a9e161cb9e6ce.tar.gz
Merge git://git.bogomips.org/git-svn
* git://git.bogomips.org/git-svn: git svn: fix dcommit to work with touched files git svn: add an option to recode pathnames
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-svn.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index b09bd9761f..4b84d08fc8 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -646,6 +646,12 @@ svn.brokenSymlinkWorkaround::
revision fetched. If unset, 'git svn' assumes this option to
be "true".
+svn.pathnameencoding::
+ This instructs git svn to recode pathnames to a given encoding.
+ It can be used by windows users and by those who work in non-utf8
+ locales to avoid corrupted file names with non-ASCII characters.
+ Valid encodings are the ones supported by Perl's Encode module.
+
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