diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:42:31 -0800 |
| commit | f468972671f0abb208fff2dac2a5ab2ca5753a18 (patch) | |
| tree | cb670a2679edce2bebedd9186d969cd7f796717e | |
| parent | Merge branch 'bc/author-committer-doc' into maint (diff) | |
| parent | docs: mention when increasing http.postBuffer is valuable (diff) | |
| download | tgif-f468972671f0abb208fff2dac2a5ab2ca5753a18.tar.xz | |
Merge branch 'bc/misconception-doc' into maint
Doc updates.
* bc/misconception-doc:
docs: mention when increasing http.postBuffer is valuable
doc: dissuade users from trying to ignore tracked files
| -rw-r--r-- | Documentation/config/http.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 16 |
2 files changed, 24 insertions, 0 deletions
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt index 8471b39f0f..e806033aab 100644 --- a/Documentation/config/http.txt +++ b/Documentation/config/http.txt @@ -199,6 +199,14 @@ http.postBuffer:: Transfer-Encoding: chunked is used to avoid creating a massive pack file locally. Default is 1 MiB, which is sufficient for most requests. ++ +Note that raising this limit is only effective for disabling chunked +transfer encoding and therefore should be used only where the remote +server or a proxy only supports HTTP/1.0 or is noncompliant with the +HTTP standard. Raising this is not, in general, an effective solution +for most push problems, but can increase memory consumption +significantly since the entire buffer is allocated even for small +pushes. http.lowSpeedLimit, http.lowSpeedTime:: If the HTTP transfer speed is less than 'http.lowSpeedLimit' diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index c7a6271daf..1489cb09a0 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -549,6 +549,22 @@ The untracked cache extension can be enabled by the `core.untrackedCache` configuration variable (see linkgit:git-config[1]). +NOTES +----- + +Users often try to use the assume-unchanged and skip-worktree bits +to tell Git to ignore changes to files that are tracked. This does not +work as expected, since Git may still check working tree files against +the index when performing certain operations. In general, Git does not +provide a way to ignore changes to tracked files, so alternate solutions +are recommended. + +For example, if the file you want to change is some sort of config file, +the repository can include a sample config file that can then be copied +into the ignored name and modified. The repository can even include a +script to treat the sample file as a template, modifying and copying it +automatically. + SEE ALSO -------- linkgit:git-config[1], |