From dbe9c5adf95e99c35dd728af2114fccfb9117c65 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 11 May 2011 11:56:11 -0700 Subject: [PATCH] Update draft release notes to 1.7.6 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.7.6.txt | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt index 8554918cf..f73a7b23d 100644 --- a/Documentation/RelNotes/1.7.6.txt +++ b/Documentation/RelNotes/1.7.6.txt @@ -6,6 +6,8 @@ Updates since v1.7.5 * Various git-svn updates. + * Updates the way content tags are handled in gitweb. + * Clean-up of the C part of i18n (but not l10n---please wait) continues. @@ -38,8 +40,8 @@ Updates since v1.7.5 * "git merge" learned "-" as a short-hand for "the previous branch", just like the way "git checkout -" works. - * "git merge-one-file" learned to honor GIT_WORK_TREE settings when - handling "both sides added, differently" conflict. + * "git rebase" that does not specify on top of which branch to rebase + the current branch now uses @{upstream} of the current branch. * "git rev-list --count" used with "--cherry-mark" counts the cherry-picked commits separately, producing more a useful output. @@ -64,6 +66,10 @@ Fixes since v1.7.5 Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are included in this release. + * "git add -p" did not work correctly when a hunk is split and then + one of them was given to the editor. + (merge jc/maint-add-p-overlapping-hunks later) + * "git config" used to choke with an insanely long line. (merge ef/maint-strbuf-init later) @@ -84,6 +90,15 @@ included in this release. From: "Junio C. Hamano" ). (merge jk/format-patch-quote-special-in-from later) + * In "git merge", per-branch branch..mergeoptions configuration + variables did not override the fallback default merge.