aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-05-25 13:37:25 -0700
committerJunio C Hamano <gitster@pobox.com>2008-05-25 13:37:25 -0700
commit834836bd3f1c817f93ee69a29c904d3333e635f0 (patch)
tree4dbae0f8d93bfe5add63c90db43dc0cbd941b6a2 /Documentation
parent6c99f18660f62f90b83f0592c81ab6a4092d6d13 (diff)
parent27554e900dd0e2b91b578f2e01c38b3eba746a77 (diff)
downloadgit-834836bd3f1c817f93ee69a29c904d3333e635f0.tar.gz
git-834836bd3f1c817f93ee69a29c904d3333e635f0.tar.xz
Merge branch 'ap/svn'
* ap/svn: git-svn: add test for --add-author-from and --use-log-author git-svn: add documentation for --add-author-from option. git-svn: Add --add-author-from option. git-svn: add documentation for --use-log-author option.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-svn.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 3eae1ebb7..c9e4efe7f 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -61,6 +61,16 @@ COMMANDS
Set the 'useSvnsyncProps' option in the [svn-remote] config.
--rewrite-root=<URL>;;
Set the 'rewriteRoot' option in the [svn-remote] config.
+--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
+ in the log message and use that as the author string.
+--add-author-from;;
+ When committing to svn from git (as part of commit 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.
--username=<USER>;;
For transports that SVN handles authentication for (http,
https, and plain svn), specify the username. For other