diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 14:22:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 14:22:00 -0800 |
| commit | b3f862c5e7e19d0ae8abc32492356ff7d1578110 (patch) | |
| tree | 95b41daba023b1705d5ec5b8d4db399c8cbc3f9d /git-svn.txt | |
| parent | 8ef91f31f6606a0370b18943c3b0f089e04873f9 (diff) | |
| download | git-htmldocs-b3f862c5e7e19d0ae8abc32492356ff7d1578110.tar.gz | |
Autogenerated HTML docs for v2.24.0-390-g083378
Diffstat (limited to 'git-svn.txt')
| -rw-r--r-- | git-svn.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-svn.txt b/git-svn.txt index 53774f5b6..6624a14fb 100644 --- a/git-svn.txt +++ b/git-svn.txt @@ -677,7 +677,8 @@ config key: svn.authorsProg -s<strategy>:: --strategy=<strategy>:: -p:: ---preserve-merges:: +--rebase-merges:: +--preserve-merges (DEPRECATED):: These are only used with the 'dcommit' and 'rebase' commands. + Passed directly to 'git rebase' when using 'dcommit' if a |