Merge branch 'vh/git-svn-doc'
* vh/git-svn-doc: git-svn.txt: small typeface improvements git-svn.txt: move option descriptions git-svn.txt: fix usage of --add-author-from
This commit is contained in:
commit
638e90c235
@ -145,17 +145,6 @@ Skip "branches" and "tags" of first level directories;;
|
|||||||
------------------------------------------------------------------------
|
------------------------------------------------------------------------
|
||||||
--
|
--
|
||||||
|
|
||||||
--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.
|
|
||||||
|
|
||||||
'clone'::
|
'clone'::
|
||||||
Runs 'init' and 'fetch'. It will automatically create a
|
Runs 'init' and 'fetch'. It will automatically create a
|
||||||
directory based on the basename of the URL passed to it;
|
directory based on the basename of the URL passed to it;
|
||||||
@ -574,6 +563,17 @@ repository that will be fetched from.
|
|||||||
For 'branch' and 'tag', display the urls that will be used for copying when
|
For 'branch' and 'tag', display the urls that will be used for copying when
|
||||||
creating the branch or tag.
|
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
|
||||||
|
in the log message and use that as the author string.
|
||||||
|
--add-author-from::
|
||||||
|
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`
|
||||||
|
will retrieve a valid author string for all commits.
|
||||||
|
|
||||||
|
|
||||||
ADVANCED OPTIONS
|
ADVANCED OPTIONS
|
||||||
----------------
|
----------------
|
||||||
|
Loading…
Reference in New Issue
Block a user