Skip to content

Commit

Permalink
Fix spelling mistakes in user manual
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Shawn Bohrer authored and Junio C Hamano committed Dec 13, 2007
1 parent 37d07f8 commit 9e5d87d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Documentation/user-manual.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1994,7 +1994,7 @@ $ git push ssh://yourserver.com/~you/proj.git +master
-------------------------------------------------

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>>.)

Expand Down Expand Up @@ -2921,7 +2921,7 @@ As you can see, a commit is defined by:
- 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
Expand Down Expand Up @@ -3242,7 +3242,7 @@ to replace them by hand. Back up your repository before attempting this
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
Expand Down

0 comments on commit 9e5d87d

Please sign in to comment.