summaryrefslogtreecommitdiff
path: root/Documentation/glossary.txt
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2007-10-09 21:00:03 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-16 02:11:02 (GMT)
commit06ada1529ce46e84aaef4e5608c1101c1c7ec73f (patch)
tree7a57504018332d6857c17f474a27681f1c91b4a6 /Documentation/glossary.txt
parent2ef8ac1b2a2d310642b8ae4dbec4b8173b4b1213 (diff)
downloadgit-06ada1529ce46e84aaef4e5608c1101c1c7ec73f.zip
git-06ada1529ce46e84aaef4e5608c1101c1c7ec73f.tar.gz
git-06ada1529ce46e84aaef4e5608c1101c1c7ec73f.tar.bz2
Fix some typos, punctuation, missing words, minor markup.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/glossary.txt')
-rw-r--r--Documentation/glossary.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 3f7b1e42..d99fa19 100644
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -52,8 +52,8 @@ GIT Glossary
[[def_cherry-picking]]cherry-picking::
In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of
changes out of a series of changes (typically commits) and record them
- as a new series of changes on top of different codebase. In GIT, this is
- performed by "git cherry-pick" command to extract the change introduced
+ as a new series of changes on top of a different codebase. In GIT, this is
+ performed by the "git cherry-pick" command to extract the change introduced
by an existing <<def_commit,commit>> and to record it based on the tip
of the current <<def_branch,branch>> as a new commit.
@@ -347,7 +347,7 @@ This commit is referred to as a "merge commit", or sometimes just a
it as my origin branch head". And `git push
$URL refs/heads/master:refs/heads/to-upstream` means "publish my
master branch head as to-upstream branch at $URL". See also
- gitlink:git-push[1]
+ gitlink:git-push[1].
[[def_repository]]repository::
A collection of <<def_ref,refs>> together with an