From df97ffc354c223ba742bae4842b51593d5b9a722 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 10 Mar 2016 14:58:00 -0800 Subject: [PATCH] Autogenerated HTML docs for v2.8.0-rc2 --- RelNotes/2.7.3.txt | 62 +++++++++++++++++++++ RelNotes/2.8.0.txt | 9 +-- cmds-mainporcelain.txt | 2 +- git-rebase.html | 4 +- git-rebase.txt | 2 +- git.html | 4 +- git.txt | 3 +- gitignore.html | 50 ++++++++++++++++- gitignore.txt | 38 ++++++++++++- howto-index.html | 2 +- howto/keep-canonical-history-correct.html | 2 +- howto/maintain-git.html | 2 +- howto/new-command.html | 2 +- howto/rebase-from-internal-branch.html | 2 +- howto/rebuild-from-update-hook.html | 2 +- howto/recover-corrupted-blob-object.html | 2 +- howto/recover-corrupted-object-harder.html | 2 +- howto/revert-a-faulty-merge.html | 2 +- howto/revert-branch-rebase.html | 2 +- howto/separating-topic-branches.html | 2 +- howto/setup-git-server-over-http.html | 2 +- howto/update-hook-example.html | 2 +- howto/use-git-daemon.html | 2 +- howto/using-merge-subtree.html | 2 +- howto/using-signed-tag-in-pull-request.html | 2 +- technical/api-index.html | 2 +- user-manual.html | 2 +- 27 files changed, 178 insertions(+), 32 deletions(-) create mode 100644 RelNotes/2.7.3.txt diff --git a/RelNotes/2.7.3.txt b/RelNotes/2.7.3.txt new file mode 100644 index 000000000..6adf03891 --- /dev/null +++ b/RelNotes/2.7.3.txt @@ -0,0 +1,62 @@ +Git v2.7.3 Release Notes +======================== + +Fixes since v2.7.2 +------------------ + + * Traditionally, the tests that try commands that work on the + contents in the working tree were named with "worktree" in their + filenames, but with the recent addition of "git worktree" + subcommand, whose tests are also named similarly, it has become + harder to tell them apart. The traditional tests have been renamed + to use "work-tree" instead in an attempt to differentiate them. + + * Many codepaths forget to check return value from git_config_set(); + the function is made to die() to make sure we do not proceed when + setting a configuration variable failed. + + * Handling of errors while writing into our internal asynchronous + process has been made more robust, which reduces flakiness in our + tests. + + * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a + rev, i.e. the object named by the the pathname with wildcard + characters in a tree object. + + * "git rev-parse --git-common-dir" used in the worktree feature + misbehaved when run from a subdirectory. + + * The "v(iew)" subcommand of the interactive "git am -i" command was + broken in 2.6.0 timeframe when the command was rewritten in C. + + * "git merge-tree" used to mishandle "both sides added" conflict with + its own "create a fake ancestor file that has the common parts of + what both sides have added and do a 3-way merge" logic; this has + been updated to use the usual "3-way merge with an empty blob as + the fake common ancestor file" approach used in the rest of the + system. + + * The memory ownership rule of fill_textconv() API, which was a bit + tricky, has been documented a bit better. + + * The documentation did not clearly state that the 'simple' mode is + now the default for "git push" when push.default configuration is + not set. + + * Recent versions of GNU grep are pickier when their input contains + arbitrary binary data, which some of our tests uses. Rewrite the + tests to sidestep the problem. + + * A helper function "git submodule" uses since v2.7.0 to list the + modules that match the pathspec argument given to its subcommands + (e.g. "submodule add ") has been fixed. + + * "git config section.var value" to set a value in per-repository + configuration file failed when it was run outside any repository, + but didn't say the reason correctly. + + * The code to read the pack data using the offsets stored in the pack + idx file has been made more carefully check the validity of the + data in the idx. + +Also includes documentation and test updates. diff --git a/RelNotes/2.8.0.txt b/RelNotes/2.8.0.txt index b7a6d6826..14b6c70ed 100644 --- a/RelNotes/2.8.0.txt +++ b/RelNotes/2.8.0.txt @@ -281,6 +281,11 @@ notes for details). listing and sparse checkout selection areas in 2.7.0; the change that is responsible for the regression has been reverted. + * Another try to improve the ignore mechanism that lets you say "this + is excluded" and then later say "oh, no, this part (that is a + subset of the previous part) is not excluded". This has still a + known limitation, though. + * Some codepaths used fopen(3) when opening a fixed path in $GIT_DIR (e.g. COMMIT_EDITMSG) that is meant to be left after the command is done. This however did not work well if the repository is set to @@ -372,10 +377,6 @@ notes for details). misbehaved when run from a subdirectory. (merge 17f1365 nd/git-common-dir-fix later to maint). - * Another try to add support to the ignore mechanism that lets you - say "this is excluded" and then later say "oh, no, this part (that - is a subset of the previous part) is not excluded". - * "git worktree add -B " did not work. * The "v(iew)" subcommand of the interactive "git am -i" command was diff --git a/cmds-mainporcelain.txt b/cmds-mainporcelain.txt index 14117c054..eb6e12314 100644 --- a/cmds-mainporcelain.txt +++ b/cmds-mainporcelain.txt @@ -77,7 +77,7 @@ linkgit:git-push[1]:: Update remote refs along with associated objects. linkgit:git-rebase[1]:: - Forward-port local commits to the updated upstream head. + Reapply commits on top of another base tip. linkgit:git-reset[1]:: Reset current HEAD to the specified state. diff --git a/git-rebase.html b/git-rebase.html index 4f29946ab..a7814fa06 100644 --- a/git-rebase.html +++ b/git-rebase.html @@ -739,7 +739,7 @@

NAME

git-rebase - - Forward-port local commits to the updated upstream head + Reapply commits on top of another base tip

@@ -2022,7 +2022,7 @@

GIT

diff --git a/git-rebase.txt b/git-rebase.txt index 6cca8bb51..6ed610a03 100644 --- a/git-rebase.txt +++ b/git-rebase.txt @@ -3,7 +3,7 @@ git-rebase(1) NAME ---- -git-rebase - Forward-port local commits to the updated upstream head +git-rebase - Reapply commits on top of another base tip SYNOPSIS -------- diff --git a/git.html b/git.html index 8d41c6bd2..265f55d89 100644 --- a/git.html +++ b/git.html @@ -1221,7 +1221,7 @@

Main porcelain commands

- Forward-port local commits to the updated upstream head. + Reapply commits on top of another base tip.

@@ -3042,7 +3042,7 @@

GIT

diff --git a/git.txt b/git.txt index 2754af8f7..951b24661 100644 --- a/git.txt +++ b/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.7.2/git.html[documentation for release 2.7.2] +* link:v2.7.3/git.html[documentation for release 2.7.3] * release notes for + link:RelNotes/2.7.3.txt[2.7.3], link:RelNotes/2.7.2.txt[2.7.2], link:RelNotes/2.7.1.txt[2.7.1], link:RelNotes/2.7.0.txt[2.7]. diff --git a/gitignore.html b/gitignore.html index 80a1b5975..dee4de81f 100644 --- a/gitignore.html +++ b/gitignore.html @@ -956,10 +956,56 @@

NOTES

  • The directory part in the re-include rules must be literal (i.e. no - wildcards) + wildcards and has to start with a /).

    • +

    A re-inclusion of a directory makes all files in the directory +unignored. For example, suppose you have files .gitignore, +dir/file1, dir/file2, and dir/file3, and have the following in +your .gitignore:

    +
    +
    +
    # .gitignore is not mentioned in .gitignore
+*
+!/dir
+# dir/file1 is not mentioned in .gitignore
+dir/file2
+!dir/file3
    +
    +

    Then:

    +
      +
    • +

      +.gitignore gets ignored, because it matches the * at the top + level; +

      +
      • +
    • +

      +dir/file1 does not get ignored, because /dir marks everything + underneath dir/ directory to be re-included unless otherwise + specified; +

      +
      • +
    • +

      +dir/file2 gets ignored, because dir/file2 matches it. +

      +
      • +
    • +

      +dir/file3 does not get ignored, because !dir/file3 matches it. + Note that the entry !dir/file3 is redundant because everything + underneath dir/ is marked to be re-included already. +

      +
      • +
    +

    Some earlier versions of Git treated !/dir above differently in +that it did not cause the paths under it unignored (but merely told +Git that patterns that begin with dir/ should not be ignored), but +this has been corrected to be consistent with /dir that says "the +directory dir/ and everything below are ignored."

    @@ -1035,7 +1081,7 @@

    GIT

    diff --git a/gitignore.txt b/gitignore.txt index 3ded6fdc9..91d1ce2a8 100644 --- a/gitignore.txt +++ b/gitignore.txt @@ -148,7 +148,43 @@ excluded, the following conditions must be met: be in the same .gitignore file. - The directory part in the re-include rules must be literal (i.e. no - wildcards) + wildcards and has to start with a `/`). + +A re-inclusion of a directory makes all files in the directory +unignored. For example, suppose you have files `.gitignore`, +`dir/file1`, `dir/file2`, and `dir/file3`, and have the following in +your `.gitignore`: + +---------------- +# .gitignore is not mentioned in .gitignore +* +!/dir +# dir/file1 is not mentioned in .gitignore +dir/file2 +!dir/file3 +---------------- + +Then: + + - `.gitignore` gets ignored, because it matches the `*` at the top + level; + + - `dir/file1` does not get ignored, because `/dir` marks everything + underneath `dir/` directory to be 're-included' unless otherwise + specified; + + - `dir/file2` gets ignored, because `dir/file2` matches it. + + - `dir/file3` does not get ignored, because `!dir/file3` matches it. + Note that the entry `!dir/file3` is redundant because everything + underneath `dir/` is marked to be 're-included' already. + +Some earlier versions of Git treated `!/dir` above differently in +that it did not cause the paths under it unignored (but merely told +Git that patterns that begin with dir/ should not be ignored), but +this has been corrected to be consistent with `/dir` that says "the +directory `dir/` and everything below are ignored." + EXAMPLES -------- diff --git a/howto-index.html b/howto-index.html index 545cb36ff..e93f69fd2 100644 --- a/howto-index.html +++ b/howto-index.html @@ -883,7 +883,7 @@

    Git Howto Index

    diff --git a/howto/keep-canonical-history-correct.html b/howto/keep-canonical-history-correct.html index 59d09dd22..13cf75fa2 100644 --- a/howto/keep-canonical-history-correct.html +++ b/howto/keep-canonical-history-correct.html @@ -936,7 +936,7 @@

    Keep authoritative canonical history correct with git pull

    diff --git a/howto/maintain-git.html b/howto/maintain-git.html index 5f2edcbe8..42694bb7c 100644 --- a/howto/maintain-git.html +++ b/howto/maintain-git.html @@ -1433,7 +1433,7 @@

    Preparing a "merge-fix"

    diff --git a/howto/new-command.html b/howto/new-command.html index 8aae5fe92..392aa3767 100644 --- a/howto/new-command.html +++ b/howto/new-command.html @@ -861,7 +861,7 @@

    Integrating a command

    diff --git a/howto/rebase-from-internal-branch.html b/howto/rebase-from-internal-branch.html index 2ad5b0244..507040ad6 100644 --- a/howto/rebase-from-internal-branch.html +++ b/howto/rebase-from-internal-branch.html @@ -893,7 +893,7 @@

    How to rebase from an internal branch

    diff --git a/howto/rebuild-from-update-hook.html b/howto/rebuild-from-update-hook.html index ea75e557c..f30ac7ed9 100644 --- a/howto/rebuild-from-update-hook.html +++ b/howto/rebuild-from-update-hook.html @@ -845,7 +845,7 @@

    How to rebuild from update hook

    diff --git a/howto/recover-corrupted-blob-object.html b/howto/recover-corrupted-blob-object.html index 5b575b15f..c89f7dea0 100644 --- a/howto/recover-corrupted-blob-object.html +++ b/howto/recover-corrupted-blob-object.html @@ -878,7 +878,7 @@

    How to recover a corrupted blob object

    diff --git a/howto/recover-corrupted-object-harder.html b/howto/recover-corrupted-object-harder.html index 332891c8c..f507b474c 100644 --- a/howto/recover-corrupted-object-harder.html +++ b/howto/recover-corrupted-object-harder.html @@ -1187,7 +1187,7 @@

    The adventure continues…

    diff --git a/howto/revert-a-faulty-merge.html b/howto/revert-a-faulty-merge.html index 7ef4a44be..c03571956 100644 --- a/howto/revert-a-faulty-merge.html +++ b/howto/revert-a-faulty-merge.html @@ -1023,7 +1023,7 @@

    How to revert a faulty merge

    diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index 26da8efbb..546d904c3 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html @@ -905,7 +905,7 @@

    How to revert an existing commit

    diff --git a/howto/separating-topic-branches.html b/howto/separating-topic-branches.html index f98ff19d2..a6ff5793f 100644 --- a/howto/separating-topic-branches.html +++ b/howto/separating-topic-branches.html @@ -839,7 +839,7 @@

    How to separate topic branches

    diff --git a/howto/setup-git-server-over-http.html b/howto/setup-git-server-over-http.html index f7f4426d2..67f58bbe0 100644 --- a/howto/setup-git-server-over-http.html +++ b/howto/setup-git-server-over-http.html @@ -1069,7 +1069,7 @@

    Troubleshooting:

    diff --git a/howto/update-hook-example.html b/howto/update-hook-example.html index c2225edf7..79e688bee 100644 --- a/howto/update-hook-example.html +++ b/howto/update-hook-example.html @@ -928,7 +928,7 @@

    How to use the update hook

    diff --git a/howto/use-git-daemon.html b/howto/use-git-daemon.html index e067701e1..8d9b7cc9d 100644 --- a/howto/use-git-daemon.html +++ b/howto/use-git-daemon.html @@ -789,7 +789,7 @@

    How to use git-daemon

    diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 286374ae5..32006e699 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html @@ -846,7 +846,7 @@

    Additional tips

    diff --git a/howto/using-signed-tag-in-pull-request.html b/howto/using-signed-tag-in-pull-request.html index 6406ca012..bdad7df0f 100644 --- a/howto/using-signed-tag-in-pull-request.html +++ b/howto/using-signed-tag-in-pull-request.html @@ -950,7 +950,7 @@

    Auditors

    diff --git a/technical/api-index.html b/technical/api-index.html index c3e12039c..10e4be860 100644 --- a/technical/api-index.html +++ b/technical/api-index.html @@ -898,7 +898,7 @@

    Git API Documents

    diff --git a/user-manual.html b/user-manual.html index b1f7f1a6b..aa06105bd 100644 --- a/user-manual.html +++ b/user-manual.html @@ -1,5 +1,5 @@ -Git User Manual

    Git User Manual

    Table of Contents

    Repositories and Branches
    How to get a Git repository
    How to check out a different version of a project
    Understanding History: Commits
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git fetch
    Fetching branches from other repositories
    Exploring Git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Developing with Git
    Telling Git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Ensuring good performance
    Ensuring reliability
    Sharing development with others
    Getting updates with git pull
    Submitting patches to a project
    Importing patches to a project
    Public Git repositories
    How to get a Git repository with minimal history
    Examples
    Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Using interactive rebases
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git fetch to do non-fast-forward updates
    Configuring remote-tracking branches
    Git concepts
    The Object Database
    The index
    Submodules
    Pitfalls with submodules
    Low-level Git operations
    Object access and manipulation
    The Workflow
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    Hacking Git
    Object storage format
    A birds-eye view of Git’s source code
    Git Glossary
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX +Git User Manual

    Git User Manual

    Table of Contents

    Repositories and Branches
    How to get a Git repository
    How to check out a different version of a project
    Understanding History: Commits
    Manipulating branches
    Examining an old version without creating a new branch
    Examining branches from a remote repository
    Naming branches, tags, and other references
    Updating a repository with git fetch
    Fetching branches from other repositories
    Exploring Git history
    How to use bisect to find a regression
    Naming commits
    Creating tags
    Browsing revisions
    Generating diffs
    Viewing old file versions
    Examples
    Developing with Git
    Telling Git your name
    Creating a new repository
    How to make a commit
    Creating good commit messages
    Ignoring files
    How to merge
    Resolving a merge
    Undoing a merge
    Fast-forward merges
    Fixing mistakes
    Ensuring good performance
    Ensuring reliability
    Sharing development with others
    Getting updates with git pull
    Submitting patches to a project
    Importing patches to a project
    Public Git repositories
    How to get a Git repository with minimal history
    Examples
    Rewriting history and maintaining patch series
    Creating the perfect patch series
    Keeping a patch series up to date using git rebase
    Rewriting a single commit
    Reordering or selecting from a patch series
    Using interactive rebases
    Other tools
    Problems with rewriting history
    Why bisecting merge commits can be harder than bisecting linear history
    Advanced branch management
    Fetching individual branches
    git fetch and fast-forwards
    Forcing git fetch to do non-fast-forward updates
    Configuring remote-tracking branches
    Git concepts
    The Object Database
    The index
    Submodules
    Pitfalls with submodules
    Low-level Git operations
    Object access and manipulation
    The Workflow
    Examining the data
    Merging multiple trees
    Merging multiple trees, continued
    Hacking Git
    Object storage format
    A birds-eye view of Git’s source code
    Git Glossary
    A. Git Quick Reference
    Creating a new repository
    Managing branches
    Exploring history
    Making changes
    Merging
    Sharing your changes
    Repository maintenance
    B. Notes and todo list for this manual

    Git is a fast distributed revision control system.

    This manual is designed to be readable by someone with basic UNIX command-line skills, but no previous knowledge of Git.

    the section called “Repositories and Branches” and the section called “Exploring Git history” explain how to fetch and study a project using git—read these chapters to learn how to build and test a particular version of a software project, search for