summaryrefslogtreecommitdiffstats
path: root/git-svn.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-02 14:05:05 -0800
committerJunio C Hamano <gitster@pobox.com>2020-11-02 14:05:05 -0800
commitdf3d3cddff51ef14a454394a9977e899f72b8244 (patch)
treeb6f9a3c1f550494dd1bb439f3b1cb05067ce621a /git-svn.txt
parentb8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff)
downloadgit-htmldocs-df3d3cddff51ef14a454394a9977e899f72b8244.tar.gz
Autogenerated HTML docs for v2.29.2-154-g7f7eb
Diffstat (limited to 'git-svn.txt')
-rw-r--r--git-svn.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-svn.txt b/git-svn.txt
index 6624a14fb..67b143cc8 100644
--- a/git-svn.txt
+++ b/git-svn.txt
@@ -701,7 +701,7 @@ creating the branch or tag.
--use-log-author::
When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
- 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
+ 'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer
in the log message and use that as the author string.
+
[verse]
@@ -710,7 +710,7 @@ config key: svn.useLogAuthor
--add-author-from::
When committing to svn from Git (as part of '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
+ `From:` or `Signed-off-by` trailer, 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.
+