summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 37d07f8)
raw | patch | inline | side by side (parent: 37d07f8)
author | Shawn Bohrer <shawn.bohrer@gmail.com> | |
Thu, 13 Dec 2007 04:36:21 +0000 (22:36 -0600) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 13 Dec 2007 17:46:52 +0000 (09:46 -0800) |
Signed-off-by: Shawn Bohrer <shawn.bohrer@gmail.com>
Acked-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/user-manual.txt | patch | blob | history |
index 93a47b439b4504467fc5ba7612b8205367f347c2..f2b42068f3c0cfcd7e34aa46a2a83edd3dd6d587 100644 (file)
-------------------------------------------------
Normally whenever a branch head in a public repository is modified, it
-is modified to point to a descendent of the commit that it pointed to
+is modified to point to a descendant of the commit that it pointed to
before. By forcing a push in this situation, you break that convention.
(See <<problems-with-rewriting-history>>.)
- a tree: The SHA1 name of a tree object (as defined below), representing
the contents of a directory at a certain point in time.
- parent(s): The SHA1 name of some number of commits which represent the
- immediately prevoius step(s) in the history of the project. The
+ immediately previous step(s) in the history of the project. The
example above has one parent; merge commits may have more than
one. A commit with no parents is called a "root" commit, and
represents the initial revision of a project. Each project must have
in case you corrupt things even more in the process.
We'll assume that the problem is a single missing or corrupted blob,
-which is sometimes a solveable problem. (Recovering missing trees and
+which is sometimes a solvable problem. (Recovering missing trees and
especially commits is *much* harder).
Before starting, verify that there is corruption, and figure out where