diff options
author | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
---|---|---|
committer | Junio C Hamano <junio@hera.kernel.org> | 2008-07-02 03:06:38 +0000 |
commit | fce7c7e1549d1a2a2b0faf5952378236eed4d468 (patch) | |
tree | ffce2ae419b52786a0e567f4fddaadd89016f62c /gitattributes.txt | |
parent | bb8e996adf4293a0b624fe77e95e12ae8d1faed9 (diff) | |
download | git-htmldocs-fce7c7e1549d1a2a2b0faf5952378236eed4d468.tar.gz |
Autogenerated HTML docs for v1.5.6.1-156-ge903b
Diffstat (limited to 'gitattributes.txt')
-rw-r--r-- | gitattributes.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gitattributes.txt b/gitattributes.txt index 6e67990f6..124170a96 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -87,9 +87,9 @@ Checking-out and checking-in These attributes affect how the contents stored in the repository are copied to the working tree files when commands -such as `git checkout` and `git merge` run. They also affect how +such as `git-checkout` and `git-merge` run. They also affect how git stores the contents you prepare in the working tree in the -repository upon `git add` and `git commit`. +repository upon `git-add` and `git-commit`. `crlf` ^^^^^^ @@ -148,16 +148,16 @@ an irreversible conversion. The safety triggers to prevent such a conversion done to the files in the work tree, but there are a few exceptions. Even though... -- "git add" itself does not touch the files in the work tree, the +- `git-add` itself does not touch the files in the work tree, the next checkout would, so the safety triggers; -- "git apply" to update a text file with a patch does touch the files +- `git-apply` to update a text file with a patch does touch the files in the work tree, but the operation is about text files and CRLF conversion is about fixing the line ending inconsistencies, so the safety does not trigger; -- "git diff" itself does not touch the files in the work tree, it is - often run to inspect the changes you intend to next "git add". To +- `git-diff` itself does not touch the files in the work tree, it is + often run to inspect the changes you intend to next `git-add`. To catch potential problems early, safety triggers. @@ -214,7 +214,7 @@ with `crlf`, and then `ident` and fed to `filter`. Generating diff text ~~~~~~~~~~~~~~~~~~~~ -The attribute `diff` affects if `git diff` generates textual +The attribute `diff` affects if `git-diff` generates textual patch for the path or just says `Binary files differ`. It also can affect what line is shown on the hunk header `@@ -k,l +n,m @@` line. @@ -513,8 +513,8 @@ archive files. 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 -linkgit:git-archive[1] has been given a tree instead of a commit or a +expansion depends on the availability of a commit ID, i.e., if +`git-archive` 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 linkgit:git-log[1], except that they need to be wrapped like this: `$Format:PLACEHOLDERS$` |