summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d2c7807)
raw | patch | inline | side by side (parent: d2c7807)
author | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Dec 2011 21:52:36 +0000 (13:52 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 9 Dec 2011 21:52:39 +0000 (13:52 -0800) |
The first two of more important topics slated for 1.7.9 have been merged.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/RelNotes/1.7.9.txt | patch | blob | history |
index 7f05936e4463509a5a29428cea732304799a83ad..258ab7a186084e5dc6804e2c679e9a41666acd20 100644 (file)
* The set of built-in function-header patterns for various languages
knows MATLAB.
-May also contain documentation updates and code clean-ups.
+ * "git pull" can be used to fetch and merge an annotated/signed tag,
+ instead of the tip of a topic branch. The GPG signature from the
+ signed tag is recorded in the resulting merge commit for later
+ auditing.
+
+ * "git branch --edit-description" can be used to add descriptive text
+ to explain what a topic branch is about.
+
+ * "git fmt-merge-msg" learned to take the branch description into
+ account when preparing a merge summary that "git merge" records
+ when merging a local branch.
+
+ * "git request-pull" has been updated to convey more information
+ useful for integrators to decide if a topic is worth merging and
+ what is pulled is indeed what the requestor asked to pull,
+ including:
+
+ - the tip of the branch being requested to be merged;
+ - the branch description describing what the topic is about;
+ - the contents of the annotated tag, when requesting to pull a tag.
+
+ * "git pull" learned to notice 'pull.rebase' configuration variable,
+ which serves as a global fallback for setting 'branch.<name>.rebase'
+ configuration variable per branch.
+
+
+Also contains minor documentation updates and code clean-ups.
Fixes since v1.7.8
* In some codepaths (notably, checkout and merge), the ignore patterns
recorded in $GIT_DIR/info/exclude were not honored. They now are.
(merge fc001b5 nd/maint-ignore-exclude later to maint).
+
+
+--
+exec >/var/tmp/1
+O=v1.7.8-162-gd2c7807
+echo O=$(git describe master)
+git log --first-parent --oneline --reverse ^$O master
+echo
+git shortlog --no-merges ^$O ^maint master