diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:31 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-19 16:06:31 -0700 |
| commit | edacb101ef831cdc59d07015b1b5cd1aaddcc588 (patch) | |
| tree | e03312e706ad3a285c19772189c48528b7ef3c2a /Documentation/git-rebase.txt | |
| parent | 4f2d651e5b3414eac5d22ff47366d22c8cc289f6 (diff) | |
| parent | f8cca019b9ea9471719505ca6ccf020feb219d98 (diff) | |
| download | git-edacb101ef831cdc59d07015b1b5cd1aaddcc588.tar.gz git-edacb101ef831cdc59d07015b1b5cd1aaddcc588.tar.xz | |
Merge branch 'ae/preservemerge'
* ae/preservemerge:
rebase: Support preserving merges in non-interactive mode
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 4e8438098..d63998569 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -253,8 +253,7 @@ OPTIONS -p:: --preserve-merges:: - Instead of ignoring merges, try to recreate them. This option - only works in interactive mode. + Instead of ignoring merges, try to recreate them. include::merge-strategies.txt[] |