diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-09-17 13:26:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-09-17 13:26:22 -0700 |
| commit | 7db630e9ad300e03ab260342c41c36ed83ecdd7a (patch) | |
| tree | 78e59560240f3901ff5f5fd41dd6578c654e4972 /config.txt | |
| parent | 32af746de6ad79c9da1e27d09695a9bec7fa4df3 (diff) | |
| download | git-htmldocs-7db630e9ad300e03ab260342c41c36ed83ecdd7a.tar.gz | |
Autogenerated HTML docs for v2.6.0-rc2-23-g0e57
Diffstat (limited to 'config.txt')
| -rw-r--r-- | config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config.txt b/config.txt index 0c351b9bc..0cc87a6f6 100644 --- a/config.txt +++ b/config.txt @@ -866,9 +866,9 @@ branch.<name>.rebase:: "git pull" is run. See "pull.rebase" for doing this in a non branch-specific manner. + - 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, also pass `--preserve-merges` along to 'git rebase' +so that locally committed merge commits will not be flattened +by running 'git pull'. + *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] @@ -2138,9 +2138,9 @@ pull.rebase:: pull" is run. See "branch.<name>.rebase" for setting this on a per-branch basis. + - 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, also pass `--preserve-merges` along to 'git rebase' +so that locally committed merge commits will not be flattened +by running 'git pull'. + *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand the implications (see linkgit:git-rebase[1] |