summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorLibravatar Yasushi SHOJI <yashi@atmark-techno.com>2005-08-16 00:23:06 +0900
committerLibravatar Junio C Hamano <junkio@cox.net>2005-08-15 15:29:24 -0700
commit90933efb6d12fb7fe3084bb257e93120f487171b (patch)
tree076cd2988c2107410bf108847e94a1defd2cacfe /Documentation/git.txt
parentShow which branch you are on in git-status output. (diff)
downloadtgif-90933efb6d12fb7fe3084bb257e93120f487171b.tar.xz
[PATCH] Run Ispell through git.txt
Signed-off-by: Yasushi SHOJI <yashi@atmark-techno.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 8d7209bdfc..dd805e3061 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -38,7 +38,7 @@ In addition, git itself comes with a spartan set of porcelain
commands. They are usable but are not meant to compete with real
Porcelains.
-There are also some ancilliary programs that can be viewed as useful
+There are also some ancillary programs that can be viewed as useful
aids for using the core commands but which are unlikely to be used by
SCMs layered over git.
@@ -191,8 +191,8 @@ link:git-commit-script.html[git-commit-script]::
link:git-show-branches-script.html[git-show-branches-script]::
Show branches and their commits.
-Ancilliary Commands
--------------------
+Ancillary Commands
+------------------
Manipulators:
link:git-apply-patch-script.html[git-apply-patch-script]::
@@ -214,7 +214,7 @@ link:git-tag-script.html[git-tag-script]::
An example script to create a tag object signed with GPG
-Interogators:
+Interrogators:
link:git-diff-helper.html[git-diff-helper]::
Generates patch format output for git-diff-*
@@ -254,7 +254,7 @@ Identifier Terminology
Symbolic Identifiers
--------------------
-Any git comand accepting any <object> can also use the following
+Any git command accepting any <object> can also use the following
symbolic notation:
HEAD::
@@ -325,7 +325,7 @@ git so take care if using Cogito etc
'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
Due to the immutable nature of git objects, old objects can be
archived into shared, read-only directories. This variable
- specifies a ":" seperated list of git object directories which
+ specifies a ":" separated list of git object directories which
can be used to search for git objects. New objects will not be
written to these directories.