diff --git a/Documentation/RelNotes/1.7.4.3.txt b/Documentation/RelNotes/1.7.4.3.txt new file mode 100644 index 0000000000..02a3d5bdf6 --- /dev/null +++ b/Documentation/RelNotes/1.7.4.3.txt @@ -0,0 +1,32 @@ +Git v1.7.4.3 Release Notes +========================== + +Fixes since v1.7.4.2 +-------------------- + + * "git apply" used to confuse lines updated by previous hunks as lines + that existed before when applying a hunk, contributing misapplication + of patches with offsets. + + * "git branch --track" (and "git checkout --track --branch") used to + allow setting up a random non-branch that does not make sense to follow + as the "upstream". The command correctly diagnoses it as an error. + + * "git checkout $other_branch" silently removed untracked symbolic links + in the working tree that are in the way in order to check out paths + under it from the named branch. + + * "git cvsimport" did not bail out immediately when the cvs server cannot + be reached, spewing unnecessary error messages that complain about the + server response that it never got. + + * "git diff --quiet" did not work very well with the "--diff-filter" + option. + + * "git grep -n" lacked a long-hand synonym --line-number. + + * "git stash apply" reported the result of its operation by running + "git status" from the top-level of the working tree; it should (and + now does) run it from the user's working directory. + +And other minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.5.txt b/Documentation/RelNotes/1.7.5.txt index 648dbfd908..9c72084ff9 100644 --- a/Documentation/RelNotes/1.7.5.txt +++ b/Documentation/RelNotes/1.7.5.txt @@ -14,8 +14,9 @@ Updates since v1.7.4 * Update to more modern HP-UX port. - * The codebase is getting prepared for i18n/l10n; no translated/translatable - strings in the code yet. + * The codebase is getting prepared for i18n/l10n; no translated + strings nor translation mechanism in the code yet, but the strings + are being marked for l10n. * The bash completion script can now complete symmetric difference for "git diff" command, e.g. "git diff ...bra". @@ -27,10 +28,6 @@ Updates since v1.7.4 * "git apply -v" reports offset lines when the patch does not apply at the exact location recorded in the diff output. - * "git branch --track" (and "git checkout --track --branch") used to - allow setting up a random non-branch that does not make sense to follow - as the "upstream". The command correctly diagnoses it as an error. - * "git config" used to be also known as "git repo-config", but the old name is now officially deprecated. @@ -63,6 +60,12 @@ Updates since v1.7.4 * "git grep --no-index" did not honor pathspecs correctly, returning paths outside the specified area. + * "git init" learned the --separate-git-dir option to allow the git + directory for a new repository created elsewhere and linked via the + gitdir mechanism. This is primarily to help submodule support later + to switch between a branch of superproject that has the submodule + and another that does not. + * "git log" type commands now understand globbing pathspecs. You can say "git log -- '*.txt'" for example. @@ -71,6 +74,10 @@ Updates since v1.7.4 or highlighting equivalent changes that appear on both sides of a symmetric difference (e.g. "log --cherry A...B"). + * A lazy "git merge" that didn't say what to merge used to be an error. + When run on a branch that has an upstream defined, however, the command + now merges from the configured upstream. + * "git mergetool" learned how to drive "beyond compare 3" as well. * "git rerere forget" without pathspec used to forget all the saved @@ -104,17 +111,6 @@ Fixes since v1.7.4 All of the fixes in the v1.7.4.X maintenance series are included in this release, unless otherwise noted. - * "git apply" used to confuse lines updated by previous hunks as lines - that existed before when applying a hunk, contributing misapplication - of patches with offsets. - - * "git checkout $other_branch" silently removed untracked symbolic links - in the working tree that are in the way in order to check out paths - under it from the named branch (js/checkout-untracked-symlink). - - * "git diff --quiet" did not work very well with the "--diff-filter" - option (jc/maint-diff-q-filter). - * "git fetch" from a client that is mostly following the remote needlessly told all of its refs to the server for both sides to compute the set of objects that need to be transferred efficiently, @@ -128,13 +124,13 @@ release, unless otherwise noted. reachable from the refs in their common alternate object store, causing it to fetch unnecessary objects (jc/maint-fetch-alt). - * "git stash apply" reported the result of its operation by running - "git status" from the top-level of the working tree; it should (and - now does) run it from the user's working directory - (pk/stash-apply-status-relative). + * "git pull" into an empty branch should have behaved as if + fast-forwarding from emptiness to the version being pulled, with + the usual protection against overwriting untracked files (need to + cherry-pick 4b3ffe5). --- exec >/var/tmp/1 -O=v1.7.5-rc0 +O=v1.7.5-rc0-99-g8f84c95 echo O=$(git describe 'master') git shortlog --no-merges ^maint ^$O master diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 442018bcb8..08c89d221c 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -192,13 +192,18 @@ self-contained. Use `git index-pack --fix-thin` --delta-base-offset:: A packed archive can express the base object of a delta as either a 20-byte object name or as an offset in the - stream, but older versions of git don't understand the + stream, but ancient versions of git don't understand the latter. By default, 'git pack-objects' only uses the former format for better compatibility. This option allows the command to use the latter format for compactness. Depending on the average delta chain length, this option typically shrinks the resulting packfile by 3-5 per-cent. ++ +Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), +`git repack` (see linkgit:git-repack[1]) pass this option by default +in modern git when they put objects in your repository into pack files. +So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle. --threads=:: Specifies the number of threads to spawn when searching for best diff --git a/Documentation/git.txt b/Documentation/git.txt index 5e57f6995a..78499db81b 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.4.1/git.html[documentation for release 1.7.4.1] +* link:v1.7.4.3/git.html[documentation for release 1.7.4.3] * release notes for + link:RelNotes/1.7.4.3.txt[1.7.4.3], + link:RelNotes/1.7.4.2.txt[1.7.4.2], link:RelNotes/1.7.4.1.txt[1.7.4.1], link:RelNotes/1.7.4.txt[1.7.4].