Update draft release notes to 1.7.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 11, 2011 at 11:56 UTC
dbe9c5adf95e99c35dd728af2114fccfb9117c65
1 file changed
+18
-3
Documentation/RelNotes/1.7.6.txt
+18
-3
@@ -6,6 +6,8 @@ Updates since v1.7.5
6
7
* Various git-svn updates.
8
9
+ * Updates the way content tags are handled in gitweb.
10
+
11
* Clean-up of the C part of i18n (but not l10n---please wait)
12
continues.
13
@@ -38,8 +40,8 @@ Updates since v1.7.5
40
* "git merge" learned "-" as a short-hand for "the previous branch", just
41
like the way "git checkout -" works.
42
41
- * "git merge-one-file" learned to honor GIT_WORK_TREE settings when
42
- handling "both sides added, differently" conflict.
43
+ * "git rebase" that does not specify on top of which branch to rebase
44
+ the current branch now uses @{upstream} of the current branch.
45
46
* "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
47
commits separately, producing more a useful output.
@@ -64,6 +66,10 @@ Fixes since v1.7.5
66
Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
67
included in this release.
68
69
+ * "git add -p" did not work correctly when a hunk is split and then
70
+ one of them was given to the editor.
71
+ (merge jc/maint-add-p-overlapping-hunks later)
72
+
73
* "git config" used to choke with an insanely long line.
74
(merge ef/maint-strbuf-init later)
75
@@ -84,6 +90,15 @@ included in this release.
90
From: "Junio C. Hamano" <jch@example.com>).
91
(merge jk/format-patch-quote-special-in-from later)
92
93
+ * In "git merge", per-branch branch.<name>.mergeoptions configuration
94
+ variables did not override the fallback default merge.<option>
95
+ configuration variables such as merge.ff, merge.log, etc.
96
+ (merge jc/maint-branch-mergeoptions later)
97
+
98
+ * "git merge-one-file" did not honor GIT_WORK_TREE settings when
99
+ handling a "both sides added, differently" conflict.
100
+ (merge jk/merge-one-file-working-tree later)
101
+
102
* "git mergetool" did not handle conflicted submoudules gracefully.
103
(merge jm/mergetool-submodules later)
104
@@ -102,5 +117,5 @@ included in this release.
117
---
118
exec >/var/tmp/1
119
echo O=$(git describe master)
105
-O=v1.7.5.1-216-g3970fc5
120
+O=v1.7.5.1-248-ga579498
121
git shortlog --no-merges ^maint ^$O master