summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-09-17 12:29:01 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-09-17 12:29:01 -0700
commit1c1fee746eb074a80f7dd3c02de286587bac90da (patch)
tree1bbf0d71ec3353f3fa443034d54694d87eae2542 /Documentation
parentUpdate RelNotes to 2.6 to describe leftover bits since -rc2 (diff)
parentDocumentation/config: fix formatting for branch.*.rebase and pull.rebase (diff)
downloadtgif-1c1fee746eb074a80f7dd3c02de286587bac90da.tar.xz
Merge branch 'as/config-doc-markup-fix'
* as/config-doc-markup-fix: Documentation/config: fix formatting for branch.*.rebase and pull.rebase
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 0c351b9bcf..0cc87a6f65 100644
--- a/Documentation/config.txt
+++ b/Documentation/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]