1 diff --git a/Documentation/RelNotes-1.5.3.txt b/Documentation/RelNotes-1.5.3.txt
2 index d111661..4b7f472 100644
3 --- a/Documentation/RelNotes-1.5.3.txt
4 +++ b/Documentation/RelNotes-1.5.3.txt
6 -GIT v1.5.3 Release Notes (draft)
7 +GIT v1.5.3 Release Notes
8 ========================
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.
15 +* Comes with git-gui 0.8.0.
17 * New commands and options.
19 + - "git-cvsserver" learned new options (--base-path, --export-all,
20 + --strict-paths) inspired by git-daemon.
22 - "git-submodule" command helps you manage the projects from
23 the superproject that contain them.
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".
29 + - "git fsck" gained --verbose option. This is really really
30 + verbose but it might help you identify exact commit that is
31 + corrupt in your repository.
33 + - "git format-patch" learned --numbered-files option. This
34 + may be useful for MH users.
36 + - "git tag -n -l" shows tag annotations while listing tags.
38 + - "git cvsimport" can optionally use the separate-remote layout.
40 + - "git blame" can be told to see through commits that changes
41 + whitespaces and indentation levels with "-w" option.
43 * Updated behavior of existing commands.
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.
49 + - "gitweb" shows merge commits a lot nicer than before. The
50 + default view uses more compact --cc format, while the UI
51 + allows to choose normal diff with any parent.
53 + - snapshot files "gitweb" creates from a repository at
54 + $path/$project/.git are more useful. We use $project part
55 + in the filename, which we used to discard.
57 + - "git cvsimort" creates lightweight tag; there is not any
58 + interesting information we can record in an annotated tag,
59 + and the handcrafted ones the old code created was not
60 + properly formed anyway.
62 + - "git-push" pretends that you immediately fetched back from
63 the remote by updating corresponding remote tracking
64 branches if you have any.
66 @@ -48,17 +83,25 @@ Updates since v1.5.2
67 - "git-apply --whitespace=strip" removes blank lines added at
70 - - fetch over git native protocols with -v shows connection
71 + - "git-fetch" over git native protocols with -v shows connection
72 status, and the IP address of the other end, to help
75 - - core.legacyheaders is no more, although we still can read
76 - objects created in a new loose object format.
77 + - We used to have core.legacyheaders configuration, when
78 + set to false, allowed git to write loose objects in a format
79 + that mimicks the format used by objects stored in packs. It
80 + turns out that this was not so useful. Although we will
81 + continue to read objects written in that format, we do not
82 + honor that configuration anymore and create loose objects in
83 + the legacy/traditional format.
85 + - "--find-copies-harder" option to diff family can now be
86 + spelled as "-C -C" for brevity.
88 - "git-mailsplit" (hence "git-am") can read from Maildir
91 - - "git cvsserver" does not barf upon seeing "cvs login"
92 + - "git-cvsserver" does not barf upon seeing "cvs login"
95 - "pack-objects" honors "delta" attribute set in
96 @@ -68,10 +111,16 @@ Updates since v1.5.2
97 - new-workdir script (in contrib) can now be used with a bare
100 + - "git-mergetool" learned to use gvimdiff.
102 + - "gitview" (in contrib) has a better blame interface.
108 + - old-style function definitions (most notably, a function
109 + without parameter defined with "func()", not "func(void)")
110 + have been eradicated.
114 @@ -88,6 +137,10 @@ Updates since v1.5.2
115 the object requested the last time, which exploits the
116 locality of references.
118 + - verifying pack contents done by "git fsck --full" got boost
119 + by carefully choosing the order to verify objects in them.
125 @@ -96,14 +149,11 @@ this release, unless otherwise noted.
129 - - .... This has not
130 - been backported to 1.5.2.x series, as it is rather an
133 + - "gitweb" had trouble handling non UTF-8 text with older
134 + Encode.pm Perl module.
138 -O=v1.5.2-45-ged82edc
139 -O=v1.5.2-172-g1a8b769
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
144 index 06c360b..3c0032c 100755
145 --- a/GIT-VERSION-GEN
146 +++ b/GIT-VERSION-GEN