summaryrefslogtreecommitdiffstats
path: root/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2008-01-07 07:55:46 +0000
committerJunio C Hamano <junio@hera.kernel.org>2008-01-07 07:55:46 +0000
commit35738e87105e1a11ced6a6b497146bbd189d4fb2 (patch)
tree352f4473f85ea0e327b3a0e3b9739d80f8462eb9 /gitattributes.txt
parent14b76487ff861981455b320a2c6d17632997773e (diff)
downloadgit-htmldocs-35738e87105e1a11ced6a6b497146bbd189d4fb2.tar.gz
Autogenerated HTML docs for v1.5.4-rc2-60-gb2e62
Diffstat (limited to 'gitattributes.txt')
-rw-r--r--gitattributes.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/gitattributes.txt b/gitattributes.txt
index cc9c7c52c..35a29fd60 100644
--- a/gitattributes.txt
+++ b/gitattributes.txt
@@ -238,7 +238,7 @@ When git needs to show you a diff for the path with `diff`
attribute set to `jcdiff`, it calls the command you specified
with the above configuration, i.e. `j-c-diff`, with 7
parameters, just like `GIT_EXTERNAL_DIFF` program is called.
-See gitlink:git[7] for details.
+See linkgit:git[7] for details.
Defining a custom hunk-header
@@ -400,7 +400,7 @@ Checking whitespace errors
The `core.whitespace` configuration variable allows you to define what
`diff` and `apply` should consider whitespace errors for all paths in
-the project (See gitlink:git-config[1]). This attribute gives you finer
+the project (See linkgit:git-config[1]). This attribute gives you finer
control per path.
Set::
@@ -481,9 +481,9 @@ Creating an archive
If the attribute `export-subst` is set for a file then git will expand
several placeholders when adding this file to an archive. The
expansion depends on the availability of a commit ID, i.e. if
-gitlink:git-archive[1] has been given a tree instead of a commit or a
+linkgit:git-archive[1] has been given a tree instead of a commit or a
tag then no replacement will be done. The placeholders are the same
-as those for the option `--pretty=format:` of gitlink:git-log[1],
+as those for the option `--pretty=format:` of linkgit:git-log[1],
except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
in the file. E.g. the string `$Format:%H$` will be replaced by the
commit hash.
@@ -491,4 +491,4 @@ commit hash.
GIT
---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite