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/gitattributes.txt | |
| parent | 07436e43daf1a97d3d702090d6289f745bd5ad90 (diff) | |
| parent | 57f6ec029090f64377ec5c0926b6e2e39b0caa4f (diff) | |
| download | 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/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index aaa073efc8..1195e83b6e 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -404,7 +404,7 @@ Performing a three-way merge The attribute `merge` affects how three versions of a file is merged when a file-level merge is necessary during `git merge`, -and other programs such as `git revert` and `git cherry-pick`. +and other commands such as `git revert` and `git cherry-pick`. Set:: |