diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:37 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 11:06:37 +0900 |
| commit | af6e0fe3a589d58bfd508c1c6ccbeb38586eb06b (patch) | |
| tree | 62cd50065b0a90efb4339ee10e66aade7f3e94f3 /Documentation/gitattributes.txt | |
| parent | 93bfe62ae3fa31429df25daf243f9778d9b929b9 (diff) | |
| parent | 9472935d81eaf9faed771878c9df0216ae0d9045 (diff) | |
| download | git-af6e0fe3a589d58bfd508c1c6ccbeb38586eb06b.tar.gz | |
Merge branch 'tb/add-renormalize'
"git add --renormalize ." is a new and safer way to record the fact
that you are correcting the end-of-line convention and other
"convert_to_git()" glitches in the in-repository data.
* tb/add-renormalize:
add: introduce "--renormalize"
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 4c68bc19d5..30687de81a 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -232,8 +232,7 @@ From a clean working directory: ------------------------------------------------- $ echo "* text=auto" >.gitattributes -$ git read-tree --empty # Clean index, force re-scan of working directory -$ git add . +$ git add --renormalize . $ git status # Show files that will be normalized $ git commit -m "Introduce end-of-line normalization" ------------------------------------------------- @@ -328,6 +327,9 @@ You can declare that a filter turns a content that by itself is unusable into a usable content by setting the filter.<driver>.required configuration variable to `true`. +Note: Whenever the clean filter is changed, the repo should be renormalized: +$ git add --renormalize . + For example, in .gitattributes, you would assign the `filter` attribute for paths. |