summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-04-07 10:18:10 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-04-07 10:18:10 +0000
commit12a3a233f89942d86ddf8c57697a2c2486c07f11 (patch)
treed6b9602dc76fbd0d707ba8dd594d47b8b56a7929 /user-manual.txt
parent5678d690dfb3a08e15be4d4b7545053724543047 (diff)
downloadgit-htmldocs-12a3a233f89942d86ddf8c57697a2c2486c07f11.tar.gz
Autogenerated HTML docs for v1.5.1-81-gee969
Diffstat (limited to 'user-manual.txt')
-rw-r--r--user-manual.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/user-manual.txt b/user-manual.txt
index 574e9c0e5..d43d2377e 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -1015,7 +1015,7 @@ $ git commit
-------------------------------------------------
[[how-to-make-a-commit]]
-how to make a commit
+How to make a commit
--------------------
Creating a new commit takes three steps:
@@ -1109,7 +1109,7 @@ $ git diff # difference between the index file and your
$ git status # a brief per-file summary of the above.
-------------------------------------------------
-creating good commit messages
+Creating good commit messages
-----------------------------
Though not required, it's a good idea to begin the commit message
@@ -1119,7 +1119,7 @@ description. Tools that turn commits into email, for example, use
the first line on the Subject line and the rest of the commit in the
body.
-how to merge
+How to merge
------------
You can rejoin two diverging branches of development using
@@ -1298,7 +1298,7 @@ the different stages of that file will be "collapsed", after which
git-diff will (by default) no longer show diffs for that file.
[[undoing-a-merge]]
-undoing a merge
+Undoing a merge
---------------
If you get stuck and decide to just give up and throw the whole mess