Git 1.7.4-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 28, 2010 at 13:52 UTC
01b97a4cb60723d18b437efdc474503d2a9dd384
2 files changed
+10
-11
Documentation/RelNotes/1.7.4.txt
+9
-10
@@ -26,8 +26,9 @@ Updates since v1.7.3
26
cover letter of the previous series; this has been changed to make
27
the patches in the new series replies to the new cover letter.
28
29
- * Bash completion script in contrib/ has been adjusted to be also
30
- usable by zsh.
29
+ * Bash completion script in contrib/ has been adjusted to be usable with
30
+ Bash 4 (options with '=value' didn't complete) It has been also made
31
+ usable with zsh.
32
33
* Different pagers can be chosen depending on which subcommand is
34
being run under the pager, using "pager.<subcommand>" variable.
@@ -76,8 +77,8 @@ Updates since v1.7.3
77
use the new --empty option to be more explicit instead.
78
79
* "git repack -f" does not spend cycles to recompress objects in the
79
- non-delta representation anymore (use -F if you really mean it when
80
- e.g. you changed the compression level).
80
+ non-delta representation anymore (use -F if you really mean it
81
+ e.g. after you changed the core.compression variable setting).
82
83
* "git merge --log" used to limit the resulting merge log to 20
84
entries; this is now customizable by giving e.g. "--log=47".
@@ -91,8 +92,9 @@ Updates since v1.7.3
92
93
* The default "recursive" merge strategy learned --rename-threshold
94
option to influence the rename detection, similar to the -M option
94
- of "git diff". E.g. "git merge -Xrename-threshold=50% ..." to use
95
- this.
95
+ of "git diff". From "git merge" frontend, "-X<strategy option>"
96
+ interface, e.g. "git merge -Xrename-threshold=50% ...", can be used
97
+ to trigger this.
98
99
* The "recursive" strategy also learned to ignore various whitespace
100
changes; the most notable is -Xignore-space-at-eol.
@@ -130,9 +132,6 @@ release, unless otherwise noted.
132
me or by her; instead it looked for commits written by me and by
133
her, which is impossible.
134
133
- * "git merge" into an unborn branch removed an untracked file "foo"
134
- from the working tree when merged branch had "foo" (2caf20c..172b642).
135
-
135
* "git push --progress" shows progress indicators now.
136
137
* "git repack" places its temporary packs under $GIT_OBJECT_DIRECTORY/pack
@@ -143,6 +142,6 @@ release, unless otherwise noted.
142
143
---
144
exec >/var/tmp/1
146
-O=v1.7.3.4-567-g38a5932
145
+O=v1.7.3.4-687-g2cd900f
146
echo O=$(git describe master)
147
git shortlog --no-merges ^maint ^$O master
GIT-VERSION-GEN
+1
-1
@@ -1,7 +1,7 @@
1
#!/bin/sh
2
3
GVF=GIT-VERSION-FILE
4
-DEF_VER=v1.7.3.GIT
4
+DEF_VER=v1.7.4-rc0
5
6
LF='
7
'