From: Andreas Schwab Date: Sat, 12 Sep 2015 14:26:53 +0000 (+0200) Subject: Documentation/config: fix formatting for branch.*.rebase and pull.rebase X-Git-Tag: v2.6.0-rc3~8^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d23871079f7b71abac55597e6ea2abc93ea3af36;p=thirdparty%2Fgit.git 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 Signed-off-by: Junio C Hamano --- 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..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..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]