diff options
| author |  Andreas Schwab <schwab@linux-m68k.org> | 2015-09-12 16:26:53 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-09-12 18:09:24 -0700 |
| commit | d23871079f7b71abac55597e6ea2abc93ea3af36 (patch) | |
| tree | bd4e57c00fb039f6fc063bd9e85464dbe370aacc | |
| parent | pull: allow pull to preserve merges when rebasing (diff) | |
| download | tgif-d23871079f7b71abac55597e6ea2abc93ea3af36.tar.xz | |
Documentation/config: fix formatting for branch.*.rebase and pull.rebase
Don't format the second paragraph as a literal block.
Signed-off-by: Andreas Schwab <schwab@linux-m68k.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4c22be20cc..0ed61d7e5e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -766,9 +766,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] @@ -1830,9 +1830,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] |