From: Junio C Hamano Date: Fri, 16 Oct 2015 21:32:53 +0000 (-0700) Subject: Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint X-Git-Tag: v2.6.2~5 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa8f64dead9d1ea5965fe1248709f1879f0da79c?hp=22f4b15e884ad7e47ce03ad809d6f5acd055c2af Merge branch 'jk/asciidoctor-section-heading-markup-fix' into maint * jk/asciidoctor-section-heading-markup-fix: Documentation: fix section header mark-up --- 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