diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-01-31 13:32:05 -0800 |
| commit | 844f7e61c9c2fcacc05eaa826a4695f20050dce5 (patch) | |
| tree | 6929313dff81381903b78110c48b2974d32ac58b /Documentation | |
| parent | af1a71f11646f6d32a36f0b68183c1e24d37f808 (diff) | |
| parent | ea9a93dcc2136b94f66991c9630f9f098e481f49 (diff) | |
| download | git-844f7e61c9c2fcacc05eaa826a4695f20050dce5.tar.gz | |
Merge branch 'ew/svn-fixes' into maint
Meant eventually for 'maint'.
* ew/svn-fixes:
git-svn: document useLogAuthor and addAuthorFrom config keys
git-svn: allow "0" in SVN path components
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-svn.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5f9e65b0c4..9bee9b0c4c 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -664,13 +664,19 @@ creating the branch or tag. 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. ++ +[verse] +config key: svn.useLogAuthor + --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. - ++ +[verse] +config key: svn.addAuthorFrom ADVANCED OPTIONS ---------------- |