Fix spelling mistakes in user manual
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>
Shawn Bohrer committed
Dec 12, 2007 at 22:36 UTC
9e5d87d49070fe0463040e826824d6ce41beb089
1 file changed
+3
-3
Documentation/user-manual.txt
+3
-3
@@ -1994,7 +1994,7 @@ $ git push ssh://yourserver.com/~you/proj.git +master
1994
-------------------------------------------------
1995
1996
Normally whenever a branch head in a public repository is modified, it
1997
-is modified to point to a descendent of the commit that it pointed to
1997
+is modified to point to a descendant of the commit that it pointed to
1998
before. By forcing a push in this situation, you break that convention.
1999
(See <<problems-with-rewriting-history>>.)
2000
@@ -2921,7 +2921,7 @@ As you can see, a commit is defined by:
2921
- a tree: The SHA1 name of a tree object (as defined below), representing
2922
the contents of a directory at a certain point in time.
2923
- parent(s): The SHA1 name of some number of commits which represent the
2924
- immediately prevoius step(s) in the history of the project. The
2924
+ immediately previous step(s) in the history of the project. The
2925
example above has one parent; merge commits may have more than
2926
one. A commit with no parents is called a "root" commit, and
2927
represents the initial revision of a project. Each project must have
@@ -3242,7 +3242,7 @@ to replace them by hand. Back up your repository before attempting this
3242
in case you corrupt things even more in the process.
3243
3244
We'll assume that the problem is a single missing or corrupted blob,
3245
-which is sometimes a solveable problem. (Recovering missing trees and
3245
+which is sometimes a solvable problem. (Recovering missing trees and
3246
especially commits is *much* harder).
3247
3248
Before starting, verify that there is corruption, and figure out where