Update draft release notes to 1.7.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
May 13, 2011 at 11:14 UTC
2de58b398b5a1f81bf74a385e41cfc2fcd9cb427
1 file changed
+16
-30
Documentation/RelNotes/1.7.6.txt
+16
-30
@@ -18,14 +18,18 @@ Updates since v1.7.5
18
* "git blame" learned "--abbrev[=<n>]" option to control the minimum
19
number of hexdigits shown for commit object names.
20
21
- * "git cvsimport" learned that CVSNT stores its password file in a
22
- location different from the traditional CVS.
23
-
21
* "git diff -C -C" used to disable the rename detection entirely when
22
there are too many copy candidate paths in the tree; now it falls
23
back to "-C" when doing so would keep the copy candidate paths
24
under the rename detection limit.
25
26
+ * "git diff" and its family of commands learned --dirstat=0 to show
27
+ directories that contribute less than 0.1% of changes.
28
+
29
+ * "git diff" and its family of commands learned --dirstat=lines mode to
30
+ assess damage to the directory based on number of lines in the patch
31
+ output, not based on the similarity numbers.
32
+
33
* "git format-patch" learned "--quiet" option to suppress the output of
34
the names of generated files.
35
@@ -53,9 +57,6 @@ Updates since v1.7.5
57
the tarball generation; snapshot from the same tree should result in
58
a same tarball.
59
56
- * "git-p4" (in contrib) learned to merge a file that was added on both
57
- branches differently by using 2-way merge.
58
-
60
Also contains various documentation updates and minor miscellaneous
61
changes.
62
@@ -70,17 +71,14 @@ included in this release.
71
one of them was given to the editor.
72
(merge jc/maint-add-p-overlapping-hunks later)
73
74
+ * "git add -u" did not resolve a conflict where our history deleted and
75
+ their history modified the same file, and the working tree resolved to
76
+ keep a file.
77
+ (merge jc/fix-add-u-unmerged later)
78
+
79
* "git config" used to choke with an insanely long line.
80
(merge ef/maint-strbuf-init later)
81
76
- * "git diff-files" did not show the mode information from the working
77
- tree side of an unmerged path correctly.
78
- (merge jc/fix-diff-files-unmerged later)
79
-
80
- * "git diff -M --cached" used to use unmerged path as a possible rename
81
- source candidate, which made no sense.
82
- (merge mz/maint-rename-unmerged later)
83
-
82
* "git format-patch" when run with "--quiet" option used to produce a
83
nonsense result that consists of alternating empty output.
84
(merge early part of cn/format-patch-quiet later)
@@ -95,27 +93,15 @@ included in this release.
93
configuration variables such as merge.ff, merge.log, etc.
94
(merge jc/maint-branch-mergeoptions later)
95
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
-
96
* "git mergetool" did not handle conflicted submoudules gracefully.
97
(merge jm/mergetool-submodules later)
98
105
- * "git rebase -i -p" failed to preserve the history when there is a
106
- redundant merge created with the --no-ff option.
107
- (merge aw/maint-rebase-i-p-no-ff later)
108
-
109
- * "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
110
- mean the same thing.
111
- (merge dm/stash-k-i-p later)
112
-
113
- * "git upload-pack" (hence "git push" over git native protocol) had a
114
- subtle race condition that could lead to a deadlock.
115
- (merge jk/maint-upload-pack-shallow later)
99
+ * "git send-pack" (hence "git push") over smalt-HTTP protocol could
100
+ deadlock when the client side pack-object died early.
101
+ (merge js/maint-send-pack-stateless-rpc-deadlock-fix later)
102
103
---
104
exec >/var/tmp/1
105
echo O=$(git describe master)
120
-O=v1.7.5.1-248-ga579498
106
+O=v1.7.5.1-288-ge4ae6ef
107
git shortlog --no-merges ^maint ^$O master