undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Documentation/config: fix formatting for branch.*.rebase and pull.rebase

Browse Source 
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>
This commit is contained in:
Andreas Schwab 2015-09-12 16:26:53 +02:00 committed by Junio C Hamano
parent 66713ef3b0
commit d23871079f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/config.txt
View File

@ -766,9 +766,9 @@ branch.<name>.rebase::
"git pull" is run. See "pull.rebase" for doing this in a non "git pull" is run. See "pull.rebase" for doing this in a non
branch-specific manner. branch-specific manner.
+ +
When preserve, also pass `--preserve-merges` along to 'git rebase' When preserve, also pass `--preserve-merges` along to 'git rebase'
so that locally committed merge commits will not be flattened so that locally committed merge commits will not be flattened
by running 'git pull'. by running 'git pull'.
+ +
*NOTE*: this is a possibly dangerous operation; do *not* use *NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase[1] 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 pull" is run. See "branch.<name>.rebase" for setting this on a
per-branch basis. per-branch basis.
+ +
When preserve, also pass `--preserve-merges` along to 'git rebase' When preserve, also pass `--preserve-merges` along to 'git rebase'
so that locally committed merge commits will not be flattened so that locally committed merge commits will not be flattened
by running 'git pull'. by running 'git pull'.
+ +
*NOTE*: this is a possibly dangerous operation; do *not* use *NOTE*: this is a possibly dangerous operation; do *not* use
it unless you understand the implications (see linkgit:git-rebase[1] it unless you understand the implications (see linkgit:git-rebase[1]