From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 20 May 2011 03:50:07 +0000 (-0700)
Subject: Update draft release notes to 1.7.6
X-Git-Tag: v1.7.6-rc0~47
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=11bc3e92bf036480ab31657825903b9b63ad9c49;p=git.git

Update draft release notes to 1.7.6

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/RelNotes/1.7.6.txt b/Documentation/RelNotes/1.7.6.txt
index a3624a6c5..f5faf280c 100644
--- a/Documentation/RelNotes/1.7.6.txt
+++ b/Documentation/RelNotes/1.7.6.txt
@@ -8,6 +8,9 @@ Updates since v1.7.5
 
  * Updates the way content tags are handled in gitweb.
 
+ * Similar to branch names, tagnames that begin with "-" are now
+   disallowed.
+
  * Clean-up of the C part of i18n (but not l10n---please wait)
    continues.
 
@@ -56,6 +59,8 @@ Updates since v1.7.5
    (or not setting it at all) restores the default behaviour of allowing
    fast-forward to happen when possible.
 
+ * p4-import (from contrib) learned a new option --preserve-user.
+
  * "git rebase" that does not specify on top of which branch to rebase
    the current branch now uses @{upstream} of the current branch.
 
@@ -65,6 +70,10 @@ Updates since v1.7.5
  * "git submodule update" learned "--force" option to get rid of local
    changes in submodules and replace them with the up-to-date version.
 
+ * "git status" and friends ignore .gitmodules file while the file is
+   still in a conflicted state during a merge, to avoid using information
+   that is not final and possibly corrupt with conflict markers.
+
  * Compressed tarball gitweb generates is made without the timestamp of
    the tarball generation; snapshot from the same tree should result in
    a same tarball.
@@ -86,14 +95,26 @@ included in this release.
 
  * The bash completion scripts should correctly work using zsh's bash
    completion emulation layer now.
-   (merge either fc/completion-zsh later)
+   (merge fc/completion-zsh later)
+
+ * The logic to handle "&" (expand to UNIX username) in GECOS field
+   miscounted the length of the name it formatted.
+   (merge rg/copy-gecos-username later)
+
+ * "git cherry-pick -s resolve" failed to cherry-pick a root commit.
+   (merge jk/cherry-pick-root-with-resolve later)
 
  * "git config" used to choke with an insanely long line.
    (merge ef/maint-strbuf-init later)
 
+ * "git log --stdin path" with an input that has additional pathspec
+   used to corrupt memory.
+   (merge jc/maint-pathspec-stdin-and-cmdline later)
+
  * "git send-pack" (hence "git push") over smalt-HTTP protocol could
    deadlock when the client side pack-object died early.
    (merge js/maint-send-pack-stateless-rpc-deadlock-fix later)
+   (merge jk/git-connection-deadlock-fix later)
 
 ---
 exec >/var/tmp/1