@@ -14,10 +14,18 @@ UI, Workflows & Features
14
14
* "git clone" learned "--single-branch" option to limit cloning to a
15
15
single branch (surprise!).
16
16
17
+ * "git clone" learned to detach the HEAD in the resulting repository
18
+ when the source repository's HEAD does not point to a branch.
19
+
17
20
* When showing a patch while ignoring whitespace changes, the context
18
21
lines are taken from the postimage, in order to make it easier to
19
22
view the output.
20
23
24
+ * "git merge" in an interactive session learned to spawn the editor
25
+ by default to let the user edit the auto-generated merge message,
26
+ to encourage people to explain their merges better. Legacy scripts
27
+ can export MERGE_AUTOEDIT=no to retain the historical behaviour.
28
+
21
29
Performance
22
30
23
31
* During "git upload-pack" in respose to "git fetch", unnecessary calls
@@ -34,6 +42,9 @@ Internal Implementation
34
42
35
43
* The test suite supports the new "test_pause" helper function.
36
44
45
+ * t/Makefile is adjusted to prevent newer versions of GNU make from
46
+ running tests in seemingly random order.
47
+
37
48
Also contains minor documentation updates and code clean-ups.
38
49
39
50
@@ -60,9 +71,25 @@ details).
60
71
to completion even when the top-level process was killed.
61
72
(merge 10c6cdd cb/maint-kill-subprocess-upon-signal later to maint).
62
73
74
+ * "git mergetool" now gives an empty file as the common base version
75
+ to the backend when dealing with the "both sides added, differently"
76
+ case.
77
+ (merge ec245ba da/maint-mergetool-twoway later to maint).
78
+
79
+ * "git submodule add $path" forgot to recompute the name to be stored
80
+ in .gitmodules when the submodule at $path was once added to the
81
+ superproject and already initialized.
82
+ (merge 1017c1a jl/submodule-re-add later to maint).
83
+
84
+ * Using "git grep -l/-L" together with options -W or --break may not
85
+ make much sense as the output is to only count the number of hits
86
+ and there is no place for file breaks, but the latter options made
87
+ "-l/-L" to miscount the hits.
88
+ (merge 50dd0f2 tr/grep-l-with-decoration later to maint).
89
+
63
90
---
64
91
exec >/var/tmp/1
65
- O=v1.7.9
92
+ O=v1.7.9-110-g873ce7c
66
93
echo O=$(git describe)
67
94
git log --first-parent --oneline ^maint $O..
68
95
echo
0 commit comments