development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-12 11:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix various doc typos

Browse source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Michael Coleman 2007-02-28 23:14:23 -06:00 committed by Junio C Hamano
parent 2eb06531e3
commit 20f50f1670
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Documentation/RelNotes-1.5.1.txt
View file

@ -50,7 +50,7 @@ Updates since v1.5.0
LF at the end of lines. Currently, which paths to consider LF at the end of lines. Currently, which paths to consider
'text' (i.e. be subjected to the autocrlf mechanism) is 'text' (i.e. be subjected to the autocrlf mechanism) is
decided purely based on the contents, but the plan is to decided purely based on the contents, but the plan is to
allow users to explicitly override this heuristics based on allow users to explicitly override this heuristic based on
paths. paths.
- The behaviour of 'git-apply', when run in a subdirectory, - The behaviour of 'git-apply', when run in a subdirectory,

8
Documentation/git-bundle.txt
View file

@ -19,7 +19,7 @@ DESCRIPTION
Some workflows require that one or more branches of development on one Some workflows require that one or more branches of development on one
machine be replicated on another machine, but the two machines cannot machine be replicated on another machine, but the two machines cannot
be directly connected so the interactive git protocols (git, ssh, be directly connected so the interactive git protocols (git, ssh,
rsync, http) cannot be used. This command provides suport for rsync, http) cannot be used. This command provides support for
git-fetch and git-pull to operate by packaging objects and references git-fetch and git-pull to operate by packaging objects and references
in an archive at the originating machine, then importing those into in an archive at the originating machine, then importing those into
another repository using gitlink:git-fetch[1] and gitlink:git-pull[1] another repository using gitlink:git-fetch[1] and gitlink:git-pull[1]
@ -58,7 +58,7 @@ unbundle <file>::
gitlink:git-fetch[1]. gitlink:git-fetch[1].
[git-rev-list-args...]:: [git-rev-list-args...]::
A list of arguments, accepatble to git-rev-parse and A list of arguments, acceptable to git-rev-parse and
git-rev-list, that specify the specific objects and references git-rev-list, that specify the specific objects and references
to transport. For example, "master~10..master" causes the to transport. For example, "master~10..master" causes the
current master reference to be packaged along with all objects current master reference to be packaged along with all objects
@ -70,7 +70,7 @@ unbundle <file>::
[refname...]:: [refname...]::
A list of references used to limit the references reported as A list of references used to limit the references reported as
available. This is principally of use to git-fetch, which available. This is principally of use to git-fetch, which
expects to recieve only those references asked for and not expects to receive only those references asked for and not
necessarily everything in the pack (in this case, git-bundle is necessarily everything in the pack (in this case, git-bundle is
acting like gitlink:git-fetch-pack[1]). acting like gitlink:git-fetch-pack[1]).
@ -87,7 +87,7 @@ specified explicitly (e.g., ^master~10), or implicitly (e.g.,
master~10..master, master --since=10.days.ago). master~10..master, master --since=10.days.ago).
It is very important that the basis used be held by the destination. It is very important that the basis used be held by the destination.
It is ok to err on the side of conservatism, causing the bundle file It is okay to err on the side of conservatism, causing the bundle file
to contain objects already in the destination as these are ignored to contain objects already in the destination as these are ignored
when unpacking at the destination. when unpacking at the destination.

2
Documentation/git-svn.txt
View file

@ -405,7 +405,7 @@ Tracking and contributing to an entire Subversion-managed project
# with the appropriate name): # with the appropriate name):
git reset --hard remotes/trunk git reset --hard remotes/trunk
# You may only dcommit to one branch/tag/trunk at a time. The usage # You may only dcommit to one branch/tag/trunk at a time. The usage
# of dcommit/rebase/show-ignore should be teh same as above. # of dcommit/rebase/show-ignore should be the same as above.
------------------------------------------------------------------------ ------------------------------------------------------------------------
REBASE VS. PULL/MERGE REBASE VS. PULL/MERGE