Skip to content

Commit dbe9c5a

Browse files
committed
Update draft release notes to 1.7.6
Signed-off-by: Junio C Hamano <[email protected]>
1 parent a579498 commit dbe9c5a

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

Documentation/RelNotes/1.7.6.txt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Updates since v1.7.5
66

77
* Various git-svn updates.
88

9+
* Updates the way content tags are handled in gitweb.
10+
911
* Clean-up of the C part of i18n (but not l10n---please wait)
1012
continues.
1113

@@ -38,8 +40,8 @@ Updates since v1.7.5
3840
* "git merge" learned "-" as a short-hand for "the previous branch", just
3941
like the way "git checkout -" works.
4042

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.
4345

4446
* "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
4547
commits separately, producing more a useful output.
@@ -64,6 +66,10 @@ Fixes since v1.7.5
6466
Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
6567
included in this release.
6668

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+
6773
* "git config" used to choke with an insanely long line.
6874
(merge ef/maint-strbuf-init later)
6975

@@ -84,6 +90,15 @@ included in this release.
8490
From: "Junio C. Hamano" <[email protected]>).
8591
(merge jk/format-patch-quote-special-in-from later)
8692

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+
87102
* "git mergetool" did not handle conflicted submoudules gracefully.
88103
(merge jm/mergetool-submodules later)
89104

@@ -102,5 +117,5 @@ included in this release.
102117
---
103118
exec >/var/tmp/1
104119
echo O=$(git describe master)
105-
O=v1.7.5.1-216-g3970fc5
120+
O=v1.7.5.1-248-ga579498
106121
git shortlog --no-merges ^maint ^$O master

0 commit comments

Comments
 (0)