summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 19eba15)
raw | patch | inline | side by side (parent: 19eba15)
author | Arjen Laarhoven <arjen@yaph.org> | |
Fri, 6 Apr 2007 23:48:36 +0000 (01:48 +0200) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Sat, 7 Apr 2007 00:20:34 +0000 (17:20 -0700) |
Signed-off-by: Arjen Laarhoven <arjen@yaph.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/user-manual.txt | patch | blob | history |
index 574e9c0e50d324ead7262e1f6b3bde72d5969350..d43d2377ec51e88116dbfed90bb1064d8fed05a1 100644 (file)
-------------------------------------------------
[[how-to-make-a-commit]]
-how to make a commit
+How to make a commit
--------------------
Creating a new commit takes three steps:
$ 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
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
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