diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:20:46 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-01 21:21:46 -0700 |
| commit | 07bc4f587028c9ae98dbf7220fdcbb2744f3fb4e (patch) | |
| tree | a65c0509b01188d435d1bfc88b7dbe7508438988 /Documentation | |
| parent | Merge branch 'ld/git-p4-tags-and-labels' (diff) | |
| parent | Git 1.7.10.1 (diff) | |
| download | tgif-07bc4f587028c9ae98dbf7220fdcbb2744f3fb4e.tar.xz | |
Sync with v1.7.10.1
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes/1.7.10.1.txt | 28 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.10.1.txt b/Documentation/RelNotes/1.7.10.1.txt index 36b8deef19..806a965a1b 100644 --- a/Documentation/RelNotes/1.7.10.1.txt +++ b/Documentation/RelNotes/1.7.10.1.txt @@ -1,12 +1,22 @@ Git v1.7.10.1 Release Notes =========================== +Additions since v1.7.10 +----------------------- + +Localization message files for Danish and German have been added. + + Fixes since v1.7.10 ------------------- * "git add -p" is not designed to deal with unmerged paths but did not exclude them and tried to apply funny patches only to fail. + * "git blame" started missing quite a few changes from the origin + since we stopped using the diff minimalization by default in v1.7.2 + era. + * When PATH contains an unreadable directory, alias expansion code did not kick in, and failed with an error that said "git-subcmd" was not found. @@ -36,6 +46,21 @@ Fixes since v1.7.10 * Rename detection logic used to match two empty files as renames during merge-recursive, leading to unnatural mismerges. + * The parser in "fast-import" did not diagnose ":9" style references + that is not followed by required SP/LF as an error. + + * When "git fetch" encounters repositories with too many references, + the command line of "fetch-pack" that is run by a helper + e.g. remote-curl, may fail to hold all of them. Now such an + internal invocation can feed the references through the standard + input of "fetch-pack". + + * "git fetch" that recurses into submodules on demand did not check + if it needs to go into submodules when non branches (most notably, + tags) are fetched. + + * "log -p --graph" used with "--stat" had a few formatting error. + * Running "notes merge --commit" failed to perform correctly when run from any directory inside $GIT_DIR/. When "notes merge" stops with conflicts, $GIT_DIR/NOTES_MERGE_WORKTREE is the place a user edits @@ -47,4 +72,7 @@ Fixes since v1.7.10 $there using the upstream information to a remote unreleated to $there. + * Giving "--continue" to a conflicted "rebase -i" session skipped a + commit that only results in changes to submodules. + Also contains minor fixes and documentation updates. diff --git a/Documentation/git.txt b/Documentation/git.txt index c2b523c589..8527775988 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ 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.10/git.html[documentation for release 1.7.10] +* link:v1.7.10.1/git.html[documentation for release 1.7.10.1] * release notes for + link:RelNotes/1.7.10.1.txt[1.7.10.1], link:RelNotes/1.7.10.txt[1.7.10]. * link:v1.7.9.7/git.html[documentation for release 1.7.9.7] |