diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-12-13 14:09:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-12-13 14:09:27 -0800 |
| commit | ad9d7346b3643a09ee6586218b7436063ebd809b (patch) | |
| tree | c9c67bdcdd6661bb8e564f686cf5c02fe362dff5 /Documentation | |
| parent | c04790a93a437458638604af90351557c98e5a5d (diff) | |
| parent | ea9a93dcc2136b94f66991c9630f9f098e481f49 (diff) | |
| download | git-ad9d7346b3643a09ee6586218b7436063ebd809b.tar.gz git-ad9d7346b3643a09ee6586218b7436063ebd809b.tar.xz | |
Merge branch 'ew/svn-fixes'
* 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 5f9e65b0c..9bee9b0c4 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 ---------------- |