kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'as/config-doc-markup-fix' 

* as/config-doc-markup-fix:
  Documentation/config: fix formatting for branch.*.rebase and pull.rebase
maint
Junio C Hamano 2015-09-17 12:29:01 -07:00
parent f4d9753a89 d23871079f
commit 1c1fee746e
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

@ -866,9 +866,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]
@ -2138,9 +2138,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]