@@ -19,8 +19,8 @@ UI, Workflows & Features
1919 $HOME/.config/git/config instead, which is in line with XDG.
2020
2121 * The value of core.attributesfile and core.excludesfile default to
22- $HOME/.config/attributes and $HOME/.config/ignore respectively when
23- these files exist.
22+ $HOME/.config/git/ attributes and $HOME/.config/git/ ignore respectively
23+ when these files exist.
2424
2525 * Logic to disambiguate abbreviated object names have been taught to
2626 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
128128releases are contained in this release (see release notes to them for
129129details).
130130
131+ * "git mergetool" did not support --tool-help option to give the list
132+ of supported backends, like "git difftool" does.
133+ (merge 109859e jc/mergetool-tool-help later to maint).
134+
135+ * "$GIT_DIR/COMMIT_EDITMSG" file that is used to hold the commit log
136+ message user edits was not documented.
137+ (merge 41f597d jk/maint-commit-document-editmsg later to maint).
138+
139+ * "git commit --amend" let the user edit the log message and then died
140+ when the human-readable committer name was given insufficiently by
141+ getpwent(3).
142+ (merge f20f387 jk/maint-commit-check-committer-early later to maint).
143+
144+ * The advise() function did not use varargs correctly to format
145+ its message.
146+ (merge 447b99c jk/maint-advise-vaddf later to maint).
147+
131148 * "git commit-tree" learned a more natural "-p <parent> <tree>" order
132149 of arguments long time ago, but recently forgot it by mistake.
133150 (merge 4b7518a kk/maint-commit-tree later to maint).
0 commit comments