diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:39 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-03 00:17:39 +0300 |
| commit | 761a4e9ab1950fc7b868629ebe478bb41235db45 (patch) | |
| tree | 6a76720a12eabfcb037c496005f794e4a52ec0e9 /Documentation/git-svn.txt | |
| parent | 0be2d65132d6b75b2146c28eb024568afa242739 (diff) | |
| parent | 3abd4a67d912e0c0980aa34def6ea55ebde84947 (diff) | |
Merge branch 'bk/sob-dco'
Document that the meaning of a Signed-off-by trailer can vary from
project to project in the end-user documentation, and clarify what
it means to this project.
* bk/sob-dco:
Documentation: stylistically normalize references to Signed-off-by:
SubmittingPatches: clarify DCO is our --signoff rule
Documentation: clarify and expand description of --signoff
doc: preparatory clean-up of description on the sign-off option
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 6624a14fbd..67b143cc81 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/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. + |