From e6ac6e1f7d54584c2b03f073b5f329a37f4a9561 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 18 Apr 2016 10:51:09 -0700 Subject: [PATCH] Fifth batch for post 2.8 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes/2.9.0.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt index 7bf95f8519..46bee4abac 100644 --- a/Documentation/RelNotes/2.9.0.txt +++ b/Documentation/RelNotes/2.9.0.txt @@ -179,6 +179,11 @@ notes for details). which was wrong. (merge f292244 ky/branch-d-worktree later to maint). + * When "git worktree" feature is in use, "git branch -m" renamed a + branch that is checked out in another worktree without adjusting + the HEAD symbolic ref for the worktree. + (merge 18eb3a9 ky/branch-m-worktree later to maint). + * "git diff -M" used to work better when two originally identical files A and B got renamed to X/A and X/B by pairing A to X/A and B to X/B, but this was broken in the 2.0 timeframe. @@ -201,6 +206,13 @@ notes for details). corrected. (merge a08feb8 tb/blame-force-read-cache-to-workaround-safe-crlf later to maint). + * A change back in version 2.7 to "git branch" broke display of a + symbolic ref in a non-standard place in the refs/ hierarchy (we + expect symbolic refs to appear in refs/remotes/*/HEAD to point at + the primary branch the remote has, and as .git/HEAD to point at the + branch we locally checked out). + (merge 95c38fb jk/branch-shortening-funny-symrefs later to maint). + * Other minor clean-ups and documentation updates (merge aed7480 mm/lockfile-error-message later to maint). (merge bfee614 jc/index-pack later to maint). -- 2.11.4.GIT