summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-29 13:59:14 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-29 13:59:14 -0700
commit6abe8f4439a714c7587c45a3e115b75a6a889131 (patch)
tree74d0eefa2ea20f82b53fa1b28a0ea199f3418e40 /Documentation/user-manual.txt
parentSeventh batch for 2.7 (diff)
parentDocumentation: match undefline with the text in old release notes (diff)
downloadtgif-6abe8f4439a714c7587c45a3e115b75a6a889131.tar.xz
Merge branch 'xf/user-manual-markup'
AsciiDoc markup fixes. * xf/user-manual-markup: Documentation: match undefline with the text in old release notes Documentation: match underline with the text Documentation: fix header markup
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 1b7987e737..764a270c83 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1491,7 +1491,7 @@ resolving a merge>>.
[[fixing-a-mistake-by-rewriting-history]]
Fixing a mistake by rewriting history
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If the problematic commit is the most recent commit, and you have not
yet made that commit public, then you may just