diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-05 12:52:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-05 12:52:46 -0800 |
| commit | 75bd003c7b8df862fd38f1e2cfb82b545d49a9e6 (patch) | |
| tree | d3d2bf4d8b400649fa8ba88a0f0100f030f32482 /Documentation/git-svn.txt | |
| parent | f06dff7b7c1cfd273f2e23cfee547c0f05f76e31 (diff) | |
| parent | ea8b7be1476a2301e3658a8e626b69c9d7f540bd (diff) | |
| download | git-75bd003c7b8df862fd38f1e2cfb82b545d49a9e6.tar.gz | |
Merge branch 'js/git-svn-use-rebase-merges'
Prepare further for "rebase --preserve-merges" deprecation.
* js/git-svn-use-rebase-merges:
git svn: stop using `rebase --preserve-merges`
Diffstat (limited to 'Documentation/git-svn.txt')
| -rw-r--r-- | Documentation/git-svn.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 53774f5b64..6624a14fbd 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/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 |