@matheusbsbs / matheus-bagliano / commits / 38fab8a2ec

An early preparation for 1.5.3-rc0

Junio C Hamano committed Jun 16, 2007 at 02:25 UTC 38fab8a2ecbe52443772a870e8ea3df3a4cb428d
1 file changed +32 -32
prep-master.txt
+32 -32
@@ -1,5 +1,5 @@
1 diff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt
2 -index d111661..6eb85aa 100644
2 +index d111661..4b7f472 100644
3 --- a/Documentation/RelNotes-1.5.3.txt
4 +++ b/Documentation/RelNotes-1.5.3.txt
5 @@ -1,4 +1,4 @@
@@ -8,7 +8,7 @@ index d111661..6eb85aa 100644
8 ========================
9
10 Updates since v1.5.2
11 -@@ -10,6 +10,8 @@ Updates since v1.5.2
11 +@@ -10,8 +10,13 @@ Updates since v1.5.2
12 * Thee are a handful pack-objects changes to help you cope better with
13 repositories with pathologically large blobs in them.
14
@@ -16,8 +16,13 @@ index d111661..6eb85aa 100644
16 +
17 * New commands and options.
18
19 ++ - "git-cvsserver" learned new options (--base-path, --export-all,
20 ++ --strict-paths) inspired by git-daemon.
21 ++
22 - "git-submodule" command helps you manage the projects from
20 -@@ -36,8 +38,38 @@ Updates since v1.5.2
23 + the superproject that contain them.
24 +
25 +@@ -36,9 +41,39 @@ Updates since v1.5.2
26 - "git repack" can be told to split resulting packs to avoid
27 exceeding limit specified with "--max-pack-size".
28
@@ -37,6 +42,7 @@ index d111661..6eb85aa 100644
42 +
43 * Updated behavior of existing commands.
44
45 +- - "git push" pretends that you immediately fetched back from
46 + - "git mergetool" chooses its backend more wisely, taking
47 + notice of its environment such as use of X, Gnome/KDE, etc.
48 +
@@ -53,10 +59,11 @@ index d111661..6eb85aa 100644
59 + and the handcrafted ones the old code created was not
60 + properly formed anyway.
61 +
56 - - "git push" pretends that you immediately fetched back from
62 ++ - "git-push" pretends that you immediately fetched back from
63 the remote by updating corresponding remote tracking
64 branches if you have any.
59 -@@ -48,17 +80,25 @@ Updates since v1.5.2
65 +
66 +@@ -48,17 +83,25 @@ Updates since v1.5.2
67 - "git-apply --whitespace=strip" removes blank lines added at
68 the end of the file.
69
@@ -86,16 +93,25 @@ index d111661..6eb85aa 100644
93 request.
94
95 - "pack-objects" honors "delta" attribute set in
89 -@@ -68,6 +108,8 @@ Updates since v1.5.2
96 +@@ -68,10 +111,16 @@ Updates since v1.5.2
97 - new-workdir script (in contrib) can now be used with a bare
98 repository.
99
100 + - "git-mergetool" learned to use gvimdiff.
101 ++
102 ++ - "gitview" (in contrib) has a better blame interface.
103 +
104
105 * Builds
106
98 -@@ -88,22 +130,40 @@ Updates since v1.5.2
107 +- -
108 ++ - old-style function definitions (most notably, a function
109 ++ without parameter defined with "func()", not "func(void)")
110 ++ have been eradicated.
111 +
112 + * Performance Tweaks
113 +
114 +@@ -88,6 +137,10 @@ Updates since v1.5.2
115 the object requested the last time, which exploits the
116 locality of references.
117
@@ -106,38 +122,22 @@ index d111661..6eb85aa 100644
122 Fixes since v1.5.2
123 ------------------
124
109 - All of the fixes in v1.5.2 maintenance series are included in
110 - this release, unless otherwise noted.
125 +@@ -96,14 +149,11 @@ this release, unless otherwise noted.
126
112 --* Bugfixes
113 -+* Bugfixes ('+' needs cherry-picking to maint)
114 -+
115 -+ + "git-merge-recursive" does not try to run file level merge
116 -+ on binary files.
117 -+
118 -+ + "git-branch --track" did not create tracking configuration
119 -+ correctly when the branch name had slash in it.
120 -+
121 -+ + "gitweb" had trouble handling non UTF-8 text with older
122 -+ Encode.pm Perl module.
123 -+
124 -+ + The email address of the user specified with user.email
125 -+ configuration was overriden by EMAIL environment variable.
126 -+
127 -+ + The tree parser did not warn about tree entries with
128 -+ nonsense file modes, and assumed they must be blobs.
129 -
130 - - .... This has not
131 - been backported to 1.5.2.x series, as it is rather an
132 - intrusive change.
127 + * Bugfixes
128
129 +- - .... This has not
130 +- been backported to 1.5.2.x series, as it is rather an
131 +- intrusive change.
132 -
133 ++ - "gitweb" had trouble handling non UTF-8 text with older
134 ++ Encode.pm Perl module.
135 +
136 --
137 exec >/var/tmp/1
138 -O=v1.5.2-45-ged82edc
139 -O=v1.5.2-172-g1a8b769
139 -+O=v1.5.2.1-133-gd44c782
140 -+O=v1.5.2.1-271-g90ac368
140 ++O=v1.5.2.2-236-g952c8c5
141 echo O=`git describe refs/heads/master`
142 git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint
143 diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN