summaryrefslogtreecommitdiff
path: root/Documentation/git-svn.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:23 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-23 05:38:23 (GMT)
commitbe75d12982e614685f47bff67676eb69c60bf624 (patch)
treeefb123b5f950c61d594d9508c319075fcabe8cab /Documentation/git-svn.txt
parentfda537adbaee0bc7423c734c9c662f9f6641c5c4 (diff)
parent5356a3c3542774f05684b5c3999060492dce2e8d (diff)
downloadgit-be75d12982e614685f47bff67676eb69c60bf624.zip
git-be75d12982e614685f47bff67676eb69c60bf624.tar.gz
git-be75d12982e614685f47bff67676eb69c60bf624.tar.bz2
Merge branch 'ah/misc-doc-updates'
Misc doc fixes. * ah/misc-doc-updates: doc: normalize [--options] to [options] in git-diff doc: add note about shell quoting to revision.txt git-svn: remove ''--add-author-from' for 'commit-diff' doc: add '-d' and '-o' for 'git push' doc: clarify ignore rules for git ls-files doc: align 'diff --no-index' in text and synopsis doc: improve formatting in githooks.txt
Diffstat (limited to 'Documentation/git-svn.txt')
-rw-r--r--Documentation/git-svn.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index d59379e..e961595 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -707,7 +707,7 @@ creating the branch or tag.
config key: svn.useLogAuthor
--add-author-from::
- When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit'
+ 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
Git commit's author string. If you use this, then `--use-log-author`