diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:24 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-10 02:14:24 +0900 |
| commit | fa1b86e45743fd5895c33adcd3769782e608bb40 (patch) | |
| tree | 75ae7fdfcddad4fd8039ca66b498cc8128bedc4c /Documentation/config | |
| parent | Merge branch 'ms/worktree-add-atomic-mkdir' (diff) | |
| parent | rebase: deprecate --preserve-merges (diff) | |
| download | tgif-fa1b86e45743fd5895c33adcd3769782e608bb40.tar.xz | |
Merge branch 'js/rebase-deprecate-preserve-merges'
"git rebase --rebase-merges" replaces its old "--preserve-merges"
option; the latter is now marked as deprecated.
* js/rebase-deprecate-preserve-merges:
rebase: deprecate --preserve-merges
Diffstat (limited to 'Documentation/config')
| -rw-r--r-- | Documentation/config/branch.txt | 6 | ||||
| -rw-r--r-- | Documentation/config/pull.txt | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt index 019d60ede2..8f4b3faadd 100644 --- a/Documentation/config/branch.txt +++ b/Documentation/config/branch.txt @@ -85,9 +85,9 @@ When `merges`, pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When preserve, also pass `--preserve-merges` along to 'git rebase' -so that locally committed merge commits will not be flattened -by running 'git pull'. +When `preserve` (deprecated in favor of `merges`), also pass +`--preserve-merges` along to 'git rebase' so that locally committed merge +commits will not be flattened by running 'git pull'. + When the value is `interactive`, the rebase is run in interactive mode. + diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt index bb23a9947d..b87cab31b3 100644 --- a/Documentation/config/pull.txt +++ b/Documentation/config/pull.txt @@ -18,9 +18,9 @@ When `merges`, pass the `--rebase-merges` option to 'git rebase' so that the local merge commits are included in the rebase (see linkgit:git-rebase[1] for details). + -When preserve, also pass `--preserve-merges` along to 'git rebase' -so that locally committed merge commits will not be flattened -by running 'git pull'. +When `preserve` (deprecated in favor of `merges`), also pass +`--preserve-merges` along to 'git rebase' so that locally committed merge +commits will not be flattened by running 'git pull'. + When the value is `interactive`, the rebase is run in interactive mode. + |