diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-19 16:30:48 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-19 16:30:48 -0700 |
| commit | d3e977b943b3562021b892f1c8f966655785708a (patch) | |
| tree | 13175e8b425489c2f4bbf7196e5475fe16fd7ab3 /Documentation | |
| parent | 5e2c08c6f0209e94b36d0770abae1a2b571cb0f1 (diff) | |
| parent | 3b2bbe9b8584947e33e9149f605149530faa7361 (diff) | |
| download | git-d3e977b943b3562021b892f1c8f966655785708a.tar.gz git-d3e977b943b3562021b892f1c8f966655785708a.tar.xz | |
Merge branch 'maint'
* maint:
Documentation: fix formatting in git-svn
t7502-commit.sh: test_must_fail doesn't work with inline environment variables
completion: add --graph to log command completion
git-merge.sh: fix typo in usage message: sucesses --> succeeds
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-svn.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index f4cbd2f21..97bed54fb 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -448,6 +448,8 @@ svn-remote.<name>.rewriteRoot:: the repository with a public http:// or svn:// URL in the metadata so users of it will see the public URL. +-- + Since the noMetadata, rewriteRoot, 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 @@ -456,7 +458,6 @@ and these settings should never be changed once they are set. Additionally, only one of these four options can be used per-svn-remote section because they affect the 'git-svn-id:' metadata line. --- BASIC EXAMPLES -------------- |