summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Valentin Haenel <valentin.haenel@gmx.de>2011-04-25 23:36:15 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-04-26 11:48:34 -0700
commit12d30657d411979af3ab9ca7139b5290340e4abb (patch)
tree67ad957a2b89cdc8f9b42ad6ddf159a7f2c8da5b
parentGit 1.7.5 (diff)
downloadtgif-12d30657d411979af3ab9ca7139b5290340e4abb.tar.xz
git-svn.txt: fix usage of --add-author-from
The option '--add-author-from' is used in 'commit-diff', 'set-tree', and 'dcommit' subcommands. Signed-off-by: Valentin Haenel <valentin.haenel@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-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 30a67486d2..60af7f73f5 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -150,7 +150,7 @@ Skip "branches" and "tags" of first level directories;;
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
+ When committing to svn from git (as part of 'commit-diff', '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