summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 873ce7c)
raw | patch | inline | side by side (parent: 873ce7c)
author | Junio C Hamano <gitster@pobox.com> | |
Wed, 1 Feb 2012 06:31:35 +0000 (22:31 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 1 Feb 2012 23:26:53 +0000 (15:26 -0800) |
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/1.7.10.txt | patch | blob | history |
index cc222819a0dfce38990be13af97e0576d4b741ff..e1d70bd27f5a905e8fa02f17d8a682b286491951 100644 (file)
* "git clone" learned "--single-branch" option to limit cloning to a
single branch (surprise!).
+ * "git clone" learned to detach the HEAD in the resulting repository
+ when the source repository's HEAD does not point to a branch.
+
* When showing a patch while ignoring whitespace changes, the context
lines are taken from the postimage, in order to make it easier to
view the output.
+ * "git merge" in an interactive session learned to spawn the editor
+ by default to let the user edit the auto-generated merge message,
+ to encourage people to explain their merges better. Legacy scripts
+ can export MERGE_AUTOEDIT=no to retain the historical behaviour.
+
Performance
* During "git upload-pack" in respose to "git fetch", unnecessary calls
* The test suite supports the new "test_pause" helper function.
+ * t/Makefile is adjusted to prevent newer versions of GNU make from
+ running tests in seemingly random order.
+
Also contains minor documentation updates and code clean-ups.
to completion even when the top-level process was killed.
(merge 10c6cdd cb/maint-kill-subprocess-upon-signal later to maint).
+ * "git mergetool" now gives an empty file as the common base version
+ to the backend when dealing with the "both sides added, differently"
+ case.
+ (merge ec245ba da/maint-mergetool-twoway later to maint).
+
+ * "git submodule add $path" forgot to recompute the name to be stored
+ in .gitmodules when the submodule at $path was once added to the
+ superproject and already initialized.
+ (merge 1017c1a jl/submodule-re-add later to maint).
+
+ * Using "git grep -l/-L" together with options -W or --break may not
+ make much sense as the output is to only count the number of hits
+ and there is no place for file breaks, but the latter options made
+ "-l/-L" to miscount the hits.
+ (merge 50dd0f2 tr/grep-l-with-decoration later to maint).
+
---
exec >/var/tmp/1
-O=v1.7.9
+O=v1.7.9-110-g873ce7c
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo