X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgitattributes.txt;h=1195e83b6e65b5cf7926c973c730ffe19ff92202;hb=9e4a90ba19033d25dca1eea495b0a8c5f06efbc6;hp=aaa073efc80522a649f17d60127aae8cc85b0b3b;hpb=54e0e6edfa60f84b582112804365e207e70f44a6;p=git.git diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index aaa073efc..1195e83b6 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::