@@ -39,14 +39,23 @@ The "-q" option to "git diff-files", which does *NOT* mean "quiet",
39
39
has been removed (it told Git to ignore deletion, which you can do
40
40
with "git diff-files --diff-filter=d").
41
41
42
+ "git request-pull" lost a few "heuristics" that often led to mistakes.
43
+
42
44
43
45
Updates since v1.9 series
44
46
-------------------------
45
47
46
- Foreign interfaces, subsystems and ports.
48
+ UI, Workflows & Features
47
49
50
+ * "git tag --list" output can be sorted using "version sort" with
51
+ "--sort=version:refname".
48
52
49
- UI, Workflows & Features
53
+ * Discard the accumulated "heuristics" to guess from which branch the
54
+ result wants to be pulled from and make sure what the end user
55
+ specified is not second-guessed by "git request-pull", to avoid
56
+ mistakes. When you pushed out your 'master' branch to your public
57
+ repository as 'for-linus', use the new "master:for-linus" syntax to
58
+ denote the branch to be pulled.
50
59
51
60
* "git grep" learned to behave in a way similar to native grep when
52
61
"-h" (no header) and "-c" (count) options are given.
@@ -144,6 +153,21 @@ Unless otherwise noted, all the fixes since v1.9 in the maintenance
144
153
track are contained in this release (see the maintenance releases'
145
154
notes for details).
146
155
156
+ * Serving objects from a shallow repository needs to write a
157
+ new file to hold the temporary shallow boundaries but it was not
158
+ cleaned when we exit due to die() or a signal.
159
+ (merge 7839632 jk/shallow-update-fix later to maint).
160
+
161
+ * When "git stash pop" stops after failing to apply the stash
162
+ (e.g. due to conflicting changes), the stash is not dropped. State
163
+ that explicitly in the output to let the users know.
164
+ (merge 2d4c993 jc/stash-pop-not-popped later to maint).
165
+
166
+ * The labels in "git status" output that describe the nature of
167
+ conflicts (e.g. "both deleted") were limited to 20 bytes, which was
168
+ too short for some l10n (e.g. fr).
169
+ (merge c7cb333 jn/wt-status later to maint).
170
+
147
171
* "git clean -d pathspec" did not use the given pathspec correctly
148
172
and ended up cleaning too much.
149
173
(merge 1f2e108 jk/clean-d-pathspec later to maint).
0 commit comments