undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix spelling mistakes in user manual

Browse Source 
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>
This commit is contained in:
Shawn Bohrer 2007-12-12 22:36:21 -06:00 committed by Junio C Hamano
parent 37d07f8f98
commit 9e5d87d490
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/user-manual.txt
View File

@ -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 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. before. By forcing a push in this situation, you break that convention.
(See <<problems-with-rewriting-history>>.) (See <<problems-with-rewriting-history>>.)
@ -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 - a tree: The SHA1 name of a tree object (as defined below), representing
the contents of a directory at a certain point in time. the contents of a directory at a certain point in time.
- parent(s): The SHA1 name of some number of commits which represent the - 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 example above has one parent; merge commits may have more than
one. A commit with no parents is called a "root" commit, and one. A commit with no parents is called a "root" commit, and
represents the initial revision of a project. Each project must have 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
in case you corrupt things even more in the process. in case you corrupt things even more in the process.
We'll assume that the problem is a single missing or corrupted blob, 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). especially commits is *much* harder).
Before starting, verify that there is corruption, and figure out where Before starting, verify that there is corruption, and figure out where