@@ -14,10 +14,18 @@ UI, Workflows & Features
1414 * "git clone" learned "--single-branch" option to limit cloning to a
1515 single branch (surprise!).
1616
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+
1720 * When showing a patch while ignoring whitespace changes, the context
1821 lines are taken from the postimage, in order to make it easier to
1922 view the output.
2023
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+
2129Performance
2230
2331 * During "git upload-pack" in respose to "git fetch", unnecessary calls
@@ -34,6 +42,9 @@ Internal Implementation
3442
3543 * The test suite supports the new "test_pause" helper function.
3644
45+ * t/Makefile is adjusted to prevent newer versions of GNU make from
46+ running tests in seemingly random order.
47+
3748Also contains minor documentation updates and code clean-ups.
3849
3950
@@ -60,9 +71,25 @@ details).
6071 to completion even when the top-level process was killed.
6172 (merge 10c6cdd cb/maint-kill-subprocess-upon-signal later to maint).
6273
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+
6390---
6491exec >/var/tmp/1
65- O=v1.7.9
92+ O=v1.7.9-110-g873ce7c
6693echo O=$(git describe)
6794git log --first-parent --oneline ^maint $O..
6895echo
0 commit comments