diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-12 08:05:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-12 08:05:28 +0900 |
| commit | fe0a9eaf31dd0c349ae4308498c33a5c3794b293 (patch) | |
| tree | d58beeacadce08282804ab8c99d258d5fa0033c7 /Documentation/git-svn.txt | |
| parent | Revert "Merge branch 'en/rename-directory-detection'" (diff) | |
| parent | git-svn: allow empty email-address using authors-prog and authors-file (diff) | |
| download | tgif-fe0a9eaf31dd0c349ae4308498c33a5c3794b293.tar.xz | |
Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn
* 'svn/authors-prog-2' of git://bogomips.org/git-svn:
git-svn: allow empty email-address using authors-prog and authors-file
git-svn: search --authors-prog in PATH too
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 636e09048e..d59379ee23 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -635,7 +635,8 @@ config key: svn.findcopiesharder -A<filename>:: --authors-file=<filename>:: - Syntax is compatible with the file used by 'git cvsimport': + Syntax is compatible with the file used by 'git cvsimport' but + an empty email address can be supplied with '<>': + ------------------------------------------------------------------------ loginname = Joe User <user@example.com> @@ -654,8 +655,14 @@ config key: svn.authorsfile If this option is specified, for each SVN committer name that does not exist in the authors file, the given file is executed with the committer name as the first argument. The program is - expected to return a single line of the form "Name <email>", - which will be treated as if included in the authors file. + expected to return a single line of the form "Name <email>" or + "Name <>", which will be treated as if included in the authors + file. ++ +Due to historical reasons a relative 'filename' is first searched +relative to the current directory for 'init' and 'clone' and relative +to the root of the working tree for 'fetch'. If 'filename' is +not found, it is searched like any other command in '$PATH'. + [verse] config key: svn.authorsProg |