Update draft release notes to 1.7.12

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

diff --git a/Documentation/RelNotes/1.7.12.txt b/Documentation/RelNotes/1.7.12.txt
index f86e537e4176f5aad4b9b9a899fe32d5b9b19270..904561de18f35b380759f4794ebe6927828f0198 100644 (file)
--- a/Documentation/RelNotes/1.7.12.txt
+++ b/Documentation/RelNotes/1.7.12.txt
@@ -19,8 +19,8 @@ UI, Workflows & Features
    $HOME/.config/git/config instead, which is in line with XDG.
 
  * The value of core.attributesfile and core.excludesfile default to
    $HOME/.config/git/config instead, which is in line with XDG.
 
  * The value of core.attributesfile and core.excludesfile default to

-   $HOME/.config/attributes and $HOME/.config/ignore respectively when
-   these files exist.
+   $HOME/.config/git/attributes and $HOME/.config/git/ignore respectively
+   when these files exist.

 
  * Logic to disambiguate abbreviated object names have been taught to
    take advantage of object types that are expected in the context,
 
  * Logic to disambiguate abbreviated object names have been taught to
    take advantage of object types that are expected in the context,


@@ -128,6 +128,23 @@ Unless otherwise noted, all the fixes since v1.7.11 in the maintenance
 releases are contained in this release (see release notes to them for
 details).
 
 releases are contained in this release (see release notes to them for
 details).
 

+ * "git mergetool" did not support --tool-help option to give the list
+   of supported backends, like "git difftool" does.
+   (merge 109859e jc/mergetool-tool-help later to maint).
+
+ * "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log
+   message user edits was not documented.
+   (merge 41f597d jk/maint-commit-document-editmsg later to maint).
+
+ * "git commit --amend" let the user edit the log message and then died
+   when the human-readable committer name was given insufficiently by
+   getpwent(3).
+   (merge f20f387 jk/maint-commit-check-committer-early later to maint).
+
+ * The advise() function did not use varargs correctly to format
+   its message.
+   (merge 447b99c jk/maint-advise-vaddf later to maint).
+

  * "git commit-tree" learned a more natural "-p <parent> <tree>" order
    of arguments long time ago, but recently forgot it by mistake.
    (merge 4b7518a kk/maint-commit-tree later to maint).
  * "git commit-tree" learned a more natural "-p <parent> <tree>" order
    of arguments long time ago, but recently forgot it by mistake.
    (merge 4b7518a kk/maint-commit-tree later to maint).