@@ -8,6 +8,8 @@ UI, Workflows & Features
88
99 * Improved handling of views, labels and branches in git-p4 (in contrib).
1010
11+ * Updated command line arguments completion script for zsh (in contrib).
12+
1113 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
1214 support incremental imports.
1315
@@ -20,6 +22,11 @@ UI, Workflows & Features
2022 * "git clone" learned to detach the HEAD in the resulting repository
2123 when the source repository's HEAD does not point to a branch.
2224
25+ * The commands in the "git diff" family and "git apply --stat" that
26+ count the number of files changed and the number of lines
27+ inserted/deleted have been updated to match the output from
28+ "diffstat". This also opens the door to i18n this line.
29+
2330 * When showing a patch while ignoring whitespace changes, the context
2431 lines are taken from the postimage, in order to make it easier to
2532 view the output.
@@ -62,6 +69,38 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
6269releases are contained in this release (see release notes to them for
6370details).
6471
72+ * "git merge --no-edit $tag" failed to honor the --no-edit option.
73+ (merge 3adab6f jn/merge-no-edit-fix later to maint).
74+
75+ * The error message emitted when we see an empty loose object was
76+ not phrased correctly.
77+ (merge 33e42de mm/empty-loose-error-message later to maint).
78+
79+ * Many small corner case bugs on "git tag -n" was corrected.
80+ (merge 31fd8d7 jk/maint-tag-show-fixes later to maint).
81+
82+ * "git commit" refused to create a commit when entries added with
83+ "add -N" remained in the index, without telling Git what their content
84+ in the next commit should be. We should have created the commit without
85+ these paths.
86+ (merge 3f6d56d jc/maint-commit-ignore-i-t-a later to maint).
87+
88+ * Search box in "gitweb" did not accept non-ASCII characters correctly.
89+ (merge 84d9e2d jn/gitweb-search-utf-8 later to maint).
90+
91+ * The code to ask for password did not fall back to the terminal
92+ input when GIT_ASKPASS is set but does not work (e.g. lack of X
93+ with GUI askpass helper).
94+ (merge 84d7273 jk/prompt-fallback-to-tty later to maint).
95+
96+ * map_user() was not rewriting its output correctly, which resulted
97+ in the user visible symptom that "git blame -e" sometimes showed
98+ excess '>' at the end of email addresses.
99+ (merge f026358 jc/maint-mailmap-output later to maint).
100+
101+ * "checkout -b" did not allow switching out of an unborn branch.
102+ (merge abe1998 jc/checkout-out-of-unborn later to maint).
103+
65104 * "add -e" learned not to show a diff for an otherwise unmodified
66105 submodule that only has uncommitted local changes in the patch
67106 prepared by for the user to edit.
@@ -85,7 +124,7 @@ details).
85124
86125---
87126exec >/var/tmp/1
88- O=v1.7.9-208-gee8d52f
127+ O=v1.7.9-249-gaa47ec9
89128echo O=$(git describe)
90129git log --first-parent --oneline ^maint $O..
91130echo
0 commit comments