@@ -16,7 +16,33 @@ Updates since v1.7.8
16
16
* The set of built-in function-header patterns for various languages
17
17
knows MATLAB.
18
18
19
- May also contain documentation updates and code clean-ups.
19
+ * "git pull" can be used to fetch and merge an annotated/signed tag,
20
+ instead of the tip of a topic branch. The GPG signature from the
21
+ signed tag is recorded in the resulting merge commit for later
22
+ auditing.
23
+
24
+ * "git branch --edit-description" can be used to add descriptive text
25
+ to explain what a topic branch is about.
26
+
27
+ * "git fmt-merge-msg" learned to take the branch description into
28
+ account when preparing a merge summary that "git merge" records
29
+ when merging a local branch.
30
+
31
+ * "git request-pull" has been updated to convey more information
32
+ useful for integrators to decide if a topic is worth merging and
33
+ what is pulled is indeed what the requestor asked to pull,
34
+ including:
35
+
36
+ - the tip of the branch being requested to be merged;
37
+ - the branch description describing what the topic is about;
38
+ - the contents of the annotated tag, when requesting to pull a tag.
39
+
40
+ * "git pull" learned to notice 'pull.rebase' configuration variable,
41
+ which serves as a global fallback for setting 'branch.<name>.rebase'
42
+ configuration variable per branch.
43
+
44
+
45
+ Also contains minor documentation updates and code clean-ups.
20
46
21
47
22
48
Fixes since v1.7.8
@@ -25,3 +51,12 @@ Fixes since v1.7.8
25
51
* In some codepaths (notably, checkout and merge), the ignore patterns
26
52
recorded in $GIT_DIR/info/exclude were not honored. They now are.
27
53
(merge fc001b5 nd/maint-ignore-exclude later to maint).
54
+
55
+
56
+ --
57
+ exec >/var/tmp/1
58
+ O=v1.7.8-162-gd2c7807
59
+ echo O=$(git describe master)
60
+ git log --first-parent --oneline --reverse ^$O master
61
+ echo
62
+ git shortlog --no-merges ^$O ^maint master
0 commit comments