diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-04-02 14:08:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-04-02 14:08:50 -0700 |
| commit | 8ea9ba9e904e3716899f808461af29a6ea279a6a (patch) | |
| tree | 96fcad8b4030c13873143c39558a597d6547819e /git-rebase.txt | |
| parent | ba423bd93b68f09cbd4f3d368517c8cb865f9b1b (diff) | |
| download | git-htmldocs-8ea9ba9e904e3716899f808461af29a6ea279a6a.tar.gz | |
Autogenerated HTML docs for v2.4.0-rc1
Diffstat (limited to 'git-rebase.txt')
| -rw-r--r-- | git-rebase.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-rebase.txt b/git-rebase.txt index d72803059..47984e84e 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -362,7 +362,9 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`. -p:: --preserve-merges:: - Instead of ignoring merges, try to recreate them. + Recreate merge commits instead of flattening the history by replaying + commits a merge commit introduces. Merge conflict resolutions or manual + amendments to merge commits are not preserved. + This uses the `--interactive` machinery internally, but combining it with the `--interactive` option explicitly is generally not a good |