summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Ralf Wildenhues <Ralf.Wildenhues@gmx.de>2007-10-09 23:01:05 +0200
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-10-15 22:11:02 -0400
commit2c619db8845e6259995ccb4f666e5bbc636c9e14 (patch)
tree1330da20beeb3212cca6bbc27bf3c1354a20a11d
parentFix some typos, punctuation, missing words, minor markup. (diff)
downloadtgif-2c619db8845e6259995ccb4f666e5bbc636c9e14.tar.xz
Fix wording in push definition.
Make the definition of push in the glossary readable. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--Documentation/glossary.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index d99fa199d6..56451775e7 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -301,8 +301,8 @@ This commit is referred to as a "merge commit", or sometimes just a
[[def_push]]push::
Pushing a <<def_branch,branch>> means to get the branch's
<<def_head_ref,head ref>> from a remote <<def_repository,repository>>,
- find out if it is an ancestor to the branch's local
- head ref is a direct, and in that case, putting all
+ find out if it is a direct ancestor to the branch's local
+ head ref, and in that case, putting all
objects, which are <<def_reachable,reachable>> from the local
head ref, and which are missing from the remote
repository, into the remote