diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:15:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-08-12 16:15:55 -0700 |
commit | 2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe (patch) | |
tree | 3346bd647b350c29eb620f5a440b43513dc2ad2d /Documentation/git.txt | |
parent | 07436e43daf1a97d3d702090d6289f745bd5ad90 (diff) | |
parent | 57f6ec029090f64377ec5c0926b6e2e39b0caa4f (diff) | |
download | git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.gz git-2cd9c2aff0d65bbce704a68d9cbe7a17e02257fe.tar.xz |
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/git.txt')
-rw-r--r-- | Documentation/git.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 5fd5953e2..5832c752e 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -327,7 +327,7 @@ Synching repositories include::cmds-synchingrepositories.txt[] -The following are helper programs used by the above; end users +The following are helper commands used by the above; end users typically do not use them directly. include::cmds-synchelpers.txt[] |