summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-16 14:32:53 -0700
committerJunio C Hamano <gitster@pobox.com>2015-10-16 14:32:53 -0700
commitaa8f64dead9d1ea5965fe1248709f1879f0da79c (patch)
tree930102144a9f9918b616fad2b085d2c73a6a6c86
parent22f4b15e884ad7e47ce03ad809d6f5acd055c2af (diff)
parentbe510e0105eaed87dca76fd71f13e22952640599 (diff)
downloadgit-aa8f64dead9d1ea5965fe1248709f1879f0da79c.tar.gz
Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint
* jk/asciidoctor-section-heading-markup-fix: Documentation: fix section header mark-up
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/user-manual.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt
index 0f0c6ff082..c06efbd42a 100644
--- a/Documentation/git-bisect-lk2009.txt
+++ b/Documentation/git-bisect-lk2009.txt
@@ -1321,7 +1321,7 @@ So git bisect is unconditional goodness - and feel free to quote that
_____________
Acknowledgments
-----------------
+---------------
Many thanks to Junio Hamano for his help in reviewing this paper, for
reviewing the patches I sent to the Git mailing list, for discussing
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 68978f5338..1b7987e737 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -3424,7 +3424,7 @@ just missing one particular blob version.
[[the-index]]
The index
------------
+---------
The index is a binary file (generally kept in `.git/index`) containing a
sorted list of path names, each with permissions and the SHA-1 of a blob