From 99dc24aa91d13a2c3a1e8d7789b6d57fdb42f750 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 27 Mar 2008 23:49:50 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.5-rc1-22-g17689 --- RelNotes-1.5.4.5.txt | 11 ++++++++++- RelNotes-1.5.5.txt | 5 ++++- gitattributes.html | 8 +++++++- gitattributes.txt | 7 +++++++ gitignore.html | 13 ++++++++++++- gitignore.txt | 12 ++++++++++++ 6 files changed, 52 insertions(+), 4 deletions(-) diff --git a/RelNotes-1.5.4.5.txt b/RelNotes-1.5.4.5.txt index fe768d497..56fcd27b5 100644 --- a/RelNotes-1.5.4.5.txt +++ b/RelNotes-1.5.4.5.txt @@ -4,6 +4,13 @@ GIT v1.5.4.5 Release Notes Fixes since v1.5.4.4 -------------------- + * "git fetch there" when the URL information came from the Cogito style + branches/there file did not update refs/heads/there (regression in + 1.5.4). + + * Bogus refspec configuration such as "remote.there.fetch = =" were not + detected as errors (regressionin 1.5.4). + * You couldn't specify a custom editor whose path contains a whitespace via GIT_EDITOR (and core.editor). @@ -46,8 +53,10 @@ Fixes since v1.5.4.4 * "git rebase -m" triggered pre-commit verification, which made "rebase --continue" impossible. +As usual, it also comes with many documentation fixes and clarifications. + -- exec >/var/tmp/1 echo O=$(git describe maint) -O=v1.5.4.4-25-ga6f7728 +O=v1.5.4.4-32-gb88605f git shortlog --no-merges $O..maint diff --git a/RelNotes-1.5.5.txt b/RelNotes-1.5.5.txt index 18ff82ba3..b299e8792 100644 --- a/RelNotes-1.5.5.txt +++ b/RelNotes-1.5.5.txt @@ -203,8 +203,11 @@ this release, unless otherwise noted. * "git-rebase --abort" did not go back to the right location if "git-reset" was run during the "git-rebase" session. + * "git imap-send" without setting imap.host did not error out but + segfaulted. + --- exec >/var/tmp/1 -O=v1.5.5-rc1 +O=v1.5.5-rc1-21-g319a36a echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/gitattributes.html b/gitattributes.html index 87d8a7c84..b0e5c841d 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -340,6 +340,12 @@ precedence), .gitattributes file in the same directory as the path in question, and its parent directories (the further the directory that contains .gitattributes is from the path in question, the lower its precedence).

+

If you wish to affect only a single repository (i.e., to assign +attributes to files that are particular to one user's workflow), then +attributes should be placed in the $GIT_DIR/info/attributes file. +Attributes which should be version-controlled and distributed to other +repositories (i.e., attributes of interest to all users) should go into +.gitattributes files.

Sometimes you would need to override an setting of an attribute for a path to unspecified state. This can be done by listing the name of the attribute prefixed with an exclamation point !.

@@ -817,7 +823,7 @@ commit hash.

diff --git a/gitattributes.txt b/gitattributes.txt index 84ec9623a..04ca63ca3 100644 --- a/gitattributes.txt +++ b/gitattributes.txt @@ -63,6 +63,13 @@ path in question, and its parent directories (the further the directory that contains `.gitattributes` is from the path in question, the lower its precedence). +If you wish to affect only a single repository (i.e., to assign +attributes to files that are particular to one user's workflow), then +attributes should be placed in the `$GIT_DIR/info/attributes` file. +Attributes which should be version-controlled and distributed to other +repositories (i.e., attributes of interest to all users) should go into +`.gitattributes` files. + Sometimes you would need to override an setting of an attribute for a path to `unspecified` state. This can be done by listing the name of the attribute prefixed with an exclamation point `!`. diff --git a/gitignore.html b/gitignore.html index 36f952cbc..e026e4fcb 100644 --- a/gitignore.html +++ b/gitignore.html @@ -314,6 +314,17 @@ Patterns read from the file specified by the configuration

+

Which file to place a pattern in depends on how the pattern is meant to +be used. Patterns which should be version-controlled and distributed to +other repositories via clone (i.e., files that all developers will want +to ignore) should go into a .gitignore file. Patterns which are +specific to a particular repository but which do not need to be shared +with other related repositories (e.g., auxiliary files that live inside +the repository but are specific to one user's workflow) should go into +the $GIT_DIR/info/exclude file. Patterns which a user wants git to +ignore in all situations (e.g., backup or temporary files generated by +the user's editor of choice) generally go into a file specified by +core.excludesfile in the user's ~/.gitconfig.

The underlying git plumbing tools, such as git-ls-files(1) and git-read-tree(1), read gitignore patterns specified by command-line options, or from @@ -422,7 +433,7 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

diff --git a/gitignore.txt b/gitignore.txt index e847b3ba6..613dca006 100644 --- a/gitignore.txt +++ b/gitignore.txt @@ -38,6 +38,18 @@ precedence, the last matching pattern decides the outcome): * Patterns read from the file specified by the configuration variable 'core.excludesfile'. +Which file to place a pattern in depends on how the pattern is meant to +be used. Patterns which should be version-controlled and distributed to +other repositories via clone (i.e., files that all developers will want +to ignore) should go into a `.gitignore` file. Patterns which are +specific to a particular repository but which do not need to be shared +with other related repositories (e.g., auxiliary files that live inside +the repository but are specific to one user's workflow) should go into +the `$GIT_DIR/info/exclude` file. Patterns which a user wants git to +ignore in all situations (e.g., backup or temporary files generated by +the user's editor of choice) generally go into a file specified by +`core.excludesfile` in the user's `~/.gitconfig`. + The underlying git plumbing tools, such as linkgit:git-ls-files[1] and linkgit:git-read-tree[1], read `gitignore` patterns specified by command-line options, or from -- 2.26.2