summaryrefslogtreecommitdiffstats
path: root/Documentation/gitcore-tutorial.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-12 16:15:55 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-12 16:15:55 -0700
commit2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (patch)
tree3346bd647b350c29eb620f5a440b43513dc2ad2d /Documentation/gitcore-tutorial.txt
parent07436e43daf1a97d3d702090d6289f745bd5ad90 (diff)
parent57f6ec029090f64377ec5c0926b6e2e39b0caa4f (diff)
downloadgit-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.gz
git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.zip
Merge branch 'maint-1.6.3' into maint
* maint-1.6.3: Change mentions of "git programs" to "git commands" Documentation: merge: one <remote> is required help.c: give correct structure's size to memset()
Diffstat (limited to 'Documentation/gitcore-tutorial.txt')
-rw-r--r--Documentation/gitcore-tutorial.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 7ba5e589d7..b3640c4e64 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -12,7 +12,7 @@ git *
DESCRIPTION
-----------
-This tutorial explains how to use the "core" git programs to set up and
+This tutorial explains how to use the "core" git commands to set up and
work with a git repository.
If you just need to use git as a revision control system you may prefer
@@ -1328,7 +1328,7 @@ into it later. Obviously, this repository creation needs to be
done only once.
[NOTE]
-'git-push' uses a pair of programs,
+'git-push' uses a pair of commands,
'git-send-pack' on your local machine, and 'git-receive-pack'
on the remote machine. The communication between the two over
the network internally uses an SSH connection.