From 868d662399786462f87df45c3d68bd5390311a6e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 26 Apr 2012 10:40:08 -0700 Subject: [PATCH] Start preparing for 1.7.10.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.10.1.txt | 50 +++++++++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes/1.7.10.1.txt diff --git a/Documentation/RelNotes/1.7.10.1.txt b/Documentation/RelNotes/1.7.10.1.txt new file mode 100644 index 0000000000..36b8deef19 --- /dev/null +++ b/Documentation/RelNotes/1.7.10.1.txt @@ -0,0 +1,50 @@ +Git v1.7.10.1 Release Notes +=========================== + +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. + + * 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. + + * "git clean -d -f" (not "-d -f -f") is supposed to protect nested + working trees of independent git repositories that exist in the + current project working tree from getting removed, but the + protection applied only to such working trees that are at the + top-level of the current project by mistake. + + * "git commit --author=$name" did not tell the name that was being + recorded in the resulting commit to hooks, even though it does do + so when the end user overrode the authorship via the + "GIT_AUTHOR_NAME" environment variable. + + * When "git commit --template F" errors out because the user did not + touch the message, it claimed that it aborts due to "empty + message", which was utterly wrong. + + * The regexp configured with diff.wordregex was incorrectly reused + across files. + + * An age-old corner case bug in combine diff (only triggered with -U0 + and the hunk at the beginning of the file needs to be shown) has + been fixed. + + * Rename detection logic used to match two empty files as renames + during merge-recursive, leading to unnatural mismerges. + + * 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 + to resolve it. + + * The 'push to upstream' implementation was broken in some corner + cases. "git push $there" without refspec, when the current branch + is set to push to a remote different from $there, used to push to + $there using the upstream information to a remote unreleated to + $there. + +Also contains minor fixes and documentation updates. diff --git a/RelNotes b/RelNotes index 2c2a169555..46474cc708 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/1.7.10.txt \ No newline at end of file +Documentation/RelNotes/1.7.10.1.txt \ No newline at end of file -- 2.11.4.GIT