diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-05-30 10:50:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-30 10:50:45 -0700 |
| commit | 2656eceae7dba180fb59a8ccbb448d8710c9f2d8 (patch) | |
| tree | fac4449bb696b056a6cf00462d4c174e9ca170e8 /Documentation | |
| parent | Merge branch 'sg/trace2-rename' (diff) | |
| parent | rebase docs: recommend `-r` over `-p` (diff) | |
| download | tgif-2656eceae7dba180fb59a8ccbb448d8710c9f2d8.tar.xz | |
Merge branch 'js/rebase-deprecate-preserve-merges'
A bit more leftover clean-up to deprepcate "rebase -p".
* js/rebase-deprecate-preserve-merges:
rebase docs: recommend `-r` over `-p`
docs: say that `--rebase=preserve` is deprecated
tests: mark a couple more test cases as requiring `rebase -p`
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-pull.txt | 5 | ||||
| -rw-r--r-- | Documentation/git-rebase.txt | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 118d9d86f7..a5e9501a0a 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -112,8 +112,9 @@ When set to `merges`, rebase using `git rebase --rebase-merges` so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When set to preserve, rebase with the `--preserve-merges` option passed -to `git rebase` so that locally created merge commits will not be flattened. +When set to `preserve` (deprecated in favor of `merges`), rebase with the +`--preserve-merges` option passed to `git rebase` so that locally created +merge commits will not be flattened. + When false, merge the current branch into the upstream branch. + diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index f5e6ae3907..5e4e927647 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -675,7 +675,8 @@ $ git rebase -i HEAD~5 And move the first patch to the end of the list. -You might want to preserve merges, if you have a history like this: +You might want to recreate merge commits, e.g. if you have a history +like this: ------------------ X @@ -689,7 +690,7 @@ Suppose you want to rebase the side branch starting at "A" to "Q". Make sure that the current HEAD is "B", and call ----------------------------- -$ git rebase -i -p --onto Q O +$ git rebase -i -r --onto Q O ----------------------------- Reordering and editing commits usually creates untested intermediate |