diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-08-13 01:23:00 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-08-13 01:23:00 +0000 |
| commit | 27a128bdf7d0ab4b37022233ba5ae84a8ebd605f (patch) | |
| tree | 899c40ef171884bcc7c8db4a798e44c506bed715 /gitattributes.txt | |
| parent | 9f88386765adc1aacb4a0e3b488c69cffc59ca70 (diff) | |
| download | git-htmldocs-27a128bdf7d0ab4b37022233ba5ae84a8ebd605f.tar.gz | |
Autogenerated HTML docs for v1.6.4-122-g6ffd7
Diffstat (limited to 'gitattributes.txt')
| -rw-r--r-- | gitattributes.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index aaa073efc..1195e83b6 100644 --- a/gitattributes.txt +++ b/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:: |