Update draft release notes to 1.7.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 6, 2011 at 11:13 UTC
4e3aa87d13b339fa678cd3cb7f23664d3a48fb21
1 file changed
+29
-3
Documentation/RelNotes/1.7.6.txt
+29
-3
@@ -9,9 +9,16 @@ Updates since v1.7.5
9
* Clean-up of the C part of i18n (but not l10n---please wait)
10
continues.
11
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
+
16
* "git blame" learned "--abbrev[=<n>]" option to control the minimum
17
number of hexdigits shown for commit object names.
18
19
+ * "git cvsimport" learned that CVSNT stores its password file in a
20
+ location different from the traditional CVS.
21
+
22
* "git diff -C -C" used to disable the rename detection entirely when
23
there are too many copy candidate paths in the tree; now it falls
24
back to "-C" when doing so would keep the copy candidate paths
@@ -20,6 +27,10 @@ Updates since v1.7.5
27
* "git format-patch" learned "--quiet" option to suppress the output of
28
the names of generated files.
29
30
+ * "git format-patch" quotes people's names when it has RFC822 special
31
+ characters in it, e.g. "Junio C. Hamano" <jch@example.com>. Earlier
32
+ it was up to the user to do this when using its output.
33
+
34
* "git log" and friends learned a new "--notes" option to replace the
35
"--show-notes" option. Unlike "--show-notes", "--notes=<ref>" does
36
not imply showing the default notes.
@@ -27,6 +38,9 @@ Updates since v1.7.5
38
* "git merge" learned "-" as a short-hand for "the previous branch", just
39
like the way "git checkout -" works.
40
41
+ * "git merge-one-file" learned to honor GIT_WORK_TREE settings when
42
+ handling "both sides added, differently" conflict.
43
+
44
* "git rev-list --count" used with "--cherry-mark" counts the cherry-picked
45
commits separately, producing more a useful output.
46
@@ -37,7 +51,11 @@ Updates since v1.7.5
51
the tarball generation; snapshot from the same tree should result in
52
a same tarball.
53
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.
59
60
61
Fixes since v1.7.5
@@ -49,7 +67,11 @@ included in this release.
67
* "git config" used to choke with an insanely long line.
68
(merge ef/maint-strbuf-init later)
69
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
75
source candidate, which made no sense.
76
(merge mz/maint-rename-unmerged later)
77
@@ -65,6 +87,10 @@ included in this release.
87
* "git mergetool" did not handle conflicted submoudules gracefully.
88
(merge jm/mergetool-submodules later)
89
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
+
94
* "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
95
mean the same thing.
96
(merge dm/stash-k-i-p later)
@@ -76,5 +102,5 @@ included in this release.
102
---
103
exec >/var/tmp/1
104
echo O=$(git describe master)
79
-O=v1.7.5-184-g23f536c
105
+O=v1.7.5.1-216-g3970fc5
106
git shortlog --no-merges ^maint ^$O master