From de9879a91fd7d4d123a303b4bcdc918f43ca3a62 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 22 Jul 2007 09:33:42 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc2-29-gc4640 --- config.txt | 4 ++-- git-config.html | 6 +++--- git-rev-list.html | 9 +++++---- git-rev-list.txt | 7 ++++--- gitignore.html | 33 +++++++++++++++++++++------------ gitignore.txt | 22 ++++++++++++++-------- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/config.txt b/config.txt index a850d55bf..dd98d95d9 100644 --- a/config.txt +++ b/config.txt @@ -286,8 +286,8 @@ core.editor:: messages by lauching an editor uses the value of this variable when it is set, and the environment variable `GIT_EDITOR` is not set. The order of preference is - `GIT_EDITOR` environment, `core.editor`, `EDITOR` and - `VISUAL` environment variables and then finally `vi`. + `GIT_EDITOR` environment, `core.editor`, `VISUAL` and + `EDITOR` environment variables and then finally `vi`. core.pager:: The command that git will use to paginate output. Can be overridden diff --git a/git-config.html b/git-config.html index 65d4bbd34..078501e9b 100644 --- a/git-config.html +++ b/git-config.html @@ -1020,8 +1020,8 @@ core.editor messages by lauching an editor uses the value of this variable when it is set, and the environment variable GIT_EDITOR is not set. The order of preference is - GIT_EDITOR environment, core.editor, EDITOR and - VISUAL environment variables and then finally vi. + GIT_EDITOR environment, core.editor, VISUAL and + EDITOR environment variables and then finally vi.

@@ -1864,7 +1864,7 @@ transfer.unpackLimit diff --git a/git-rev-list.html b/git-rev-list.html index ed8c7f3ab..238ecce0d 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -291,7 +291,8 @@ git-rev-list(1) Manual Page [ --cherry-pick ] [ --encoding[=<encoding>] ] [ --(author|committer|grep)=<pattern> ] - [ --regexp-ignore-case ] [ --extended-regexp ] + [ --regexp-ignore-case | \-i ] + [ --extended-regexp | \-E ] [ --date={local|relative|default|iso|rfc|short} ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] @@ -574,7 +575,7 @@ limiting may be applied.

---regexp-ignore-case +-i, --regexp-ignore-case

@@ -582,7 +583,7 @@ limiting may be applied.

---extended-regexp +-E, --extended-regexp

@@ -1124,7 +1125,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 08e7573b9..043013909 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -27,7 +27,8 @@ SYNOPSIS [ \--cherry-pick ] [ \--encoding[=] ] [ \--(author|committer|grep)= ] - [ \--regexp-ignore-case ] [ \--extended-regexp ] + [ \--regexp-ignore-case | \-i ] + [ \--extended-regexp | \-E ] [ \--date={local|relative|default|iso|rfc|short} ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] @@ -227,11 +228,11 @@ limiting may be applied. Limit the commits output to ones with log message that matches the specified pattern (regular expression). ---regexp-ignore-case:: +-i, --regexp-ignore-case:: Match the regexp limiting patterns without regard to letters case. ---extended-regexp:: +-E, --extended-regexp:: Consider the limiting patterns to be extended regular expressions instead of the default basic regular expressions. diff --git a/gitignore.html b/gitignore.html index 2409b7ac4..33da1ff3b 100644 --- a/gitignore.html +++ b/gitignore.html @@ -281,30 +281,38 @@ git should ignore. Each line in a gitignore file specifies a pattern.

When deciding whether to ignore a path, git normally checks gitignore patterns from multiple sources, with the following -order of precedence:

+order of precedence, from highest to lowest (within one level of +precedence, the last matching pattern decides the outcome):

  • -Patterns read from the file specified by the configuration - variable core.excludesfile. -

    -
    • -
  • -

    -Patterns read from $GIT_DIR/info/exclude. +Patterns read from the command line for those commands that support + them.

  • Patterns read from a .gitignore file in the same directory - as the path, or in any parent directory, ordered from the - deepest such file to a file in the root of the repository. + as the path, or in any parent directory, with patterns in the + higher level files (up to the root) being overriden by those in + lower level files down to the directory containing the file. These patterns match relative to the location of the .gitignore file. A project normally includes such .gitignore files in its repository, containing patterns for files generated as part of the project build.

    • +
  • +

    +Patterns read from $GIT_DIR/info/exclude. +

    +
    • +
  • +

    +Patterns read from the file specified by the configuration + variable core.excludesfile. +

    +

The underlying git plumbing tools, such as git-ls-files(1) and git-read-tree(1), read @@ -329,7 +337,8 @@ A line starting with # serves as a comment.

An optional prefix ! which negates the pattern; any matching file excluded by a previous pattern will become - included again. + included again. If a negated pattern matches, this will + override lower precedence patterns sources.

  • @@ -403,7 +412,7 @@ Frank Lichtenheld, and the git-list <git@vger.kernel.org>.

    diff --git a/gitignore.txt b/gitignore.txt index ea79d74b8..9c8309569 100644 --- a/gitignore.txt +++ b/gitignore.txt @@ -18,21 +18,26 @@ pattern. When deciding whether to ignore a path, git normally checks `gitignore` patterns from multiple sources, with the following -order of precedence: +order of precedence, from highest to lowest (within one level of +precedence, the last matching pattern decides the outcome): - * Patterns read from the file specified by the configuration - variable 'core.excludesfile'. - - * Patterns read from `$GIT_DIR/info/exclude`. + * Patterns read from the command line for those commands that support + them. * Patterns read from a `.gitignore` file in the same directory - as the path, or in any parent directory, ordered from the - deepest such file to a file in the root of the repository. + as the path, or in any parent directory, with patterns in the + higher level files (up to the root) being overriden by those in + lower level files down to the directory containing the file. These patterns match relative to the location of the `.gitignore` file. A project normally includes such `.gitignore` files in its repository, containing patterns for files generated as part of the project build. + * Patterns read from `$GIT_DIR/info/exclude`. + + * Patterns read from the file specified by the configuration + variable 'core.excludesfile'. + The underlying git plumbing tools, such as gitlink:git-ls-files[1] and gitlink:git-read-tree[1], read `gitignore` patterns specified by command-line options, or from @@ -49,7 +54,8 @@ Patterns have the following format: - An optional prefix '!' which negates the pattern; any matching file excluded by a previous pattern will become - included again. + included again. If a negated pattern matches, this will + override lower precedence patterns sources. - If the pattern does not contain a slash '/', git treats it as a shell glob pattern and checks for a match against the -- 2.26.2