Skip to content

Commit 4e3aa87

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

File tree

1 file changed

+29
-3
lines changed

1 file changed

+29
-3
lines changed

Documentation/RelNotes/1.7.6.txt

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,16 @@ Updates since v1.7.5
99
* Clean-up of the C part of i18n (but not l10n---please wait)
1010
continues.
1111

12+
* Processes spawned by "[alias] <name> = !process" in the configuration
13+
can inspect GIT_PREFIX environment variable to learn where in the
14+
working tree the original command was invoked.
15+
1216
* "git blame" learned "--abbrev[=<n>]" option to control the minimum
1317
number of hexdigits shown for commit object names.
1418

19+
* "git cvsimport" learned that CVSNT stores its password file in a
20+
location different from the traditional CVS.
21+
1522
* "git diff -C -C" used to disable the rename detection entirely when
1623
there are too many copy candidate paths in the tree; now it falls
1724
back to "-C" when doing so would keep the copy candidate paths
@@ -20,13 +27,20 @@ Updates since v1.7.5
2027
* "git format-patch" learned "--quiet" option to suppress the output of
2128
the names of generated files.
2229

30+
* "git format-patch" quotes people's names when it has RFC822 special
31+
characters in it, e.g. "Junio C. Hamano" <[email protected]>. Earlier
32+
it was up to the user to do this when using its output.
33+
2334
* "git log" and friends learned a new "--notes" option to replace the
2435
"--show-notes" option. Unlike "--show-notes", "--notes=<ref>" does
2536
not imply showing the default notes.
2637

2738
* "git merge" learned "-" as a short-hand for "the previous branch", just
2839
like the way "git checkout -" works.
2940

41+
* "git merge-one-file" learned to honor GIT_WORK_TREE settings when
42+
handling "both sides added, differently" conflict.
43+
3044
* "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
3145
commits separately, producing more a useful output.
3246

@@ -37,7 +51,11 @@ Updates since v1.7.5
3751
the tarball generation; snapshot from the same tree should result in
3852
a same tarball.
3953

40-
Also contains various documentation updates.
54+
* "git-p4" (in contrib) learned to merge a file that was added on both
55+
branches differently by using 2-way merge.
56+
57+
Also contains various documentation updates and minor miscellaneous
58+
changes.
4159

4260

4361
Fixes since v1.7.5
@@ -49,7 +67,11 @@ included in this release.
4967
* "git config" used to choke with an insanely long line.
5068
(merge ef/maint-strbuf-init later)
5169

52-
* "diff -M --cached" used to use unmerged path as a possible rename
70+
* "git diff-files" did not show the mode information from the working
71+
tree side of an unmerged path correctly.
72+
(merge jc/fix-diff-files-unmerged later)
73+
74+
* "git diff -M --cached" used to use unmerged path as a possible rename
5375
source candidate, which made no sense.
5476
(merge mz/maint-rename-unmerged later)
5577

@@ -65,6 +87,10 @@ included in this release.
6587
* "git mergetool" did not handle conflicted submoudules gracefully.
6688
(merge jm/mergetool-submodules later)
6789

90+
* "git rebase -i -p" failed to preserve the history when there is a
91+
redundant merge created with the --no-ff option.
92+
(merge aw/maint-rebase-i-p-no-ff later)
93+
6894
* "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
6995
mean the same thing.
7096
(merge dm/stash-k-i-p later)
@@ -76,5 +102,5 @@ included in this release.
76102
---
77103
exec >/var/tmp/1
78104
echo O=$(git describe master)
79-
O=v1.7.5-184-g23f536c
105+
O=v1.7.5.1-216-g3970fc5
80106
git shortlog --no-merges ^maint ^$O master

0 commit comments

Comments
 (0)