aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-14 15:25:53 -0800
committerJunio C Hamano <junkio@cox.net>2007-02-14 15:25:53 -0800
commit78e90f89e39b112af2670516f80586163dcd56ca (patch)
tree700de0cc6c28079dddf50c70d3c9d0afaada659e /Documentation
parent9a894e8e7c85794d39745eb83462a2001816ac3b (diff)
parent204d409247e7bbc7848569462aa11a87e373c8d6 (diff)
downloadgit-78e90f89e39b112af2670516f80586163dcd56ca.tar.gz
git-78e90f89e39b112af2670516f80586163dcd56ca.tar.xz
Merge branch 'maint'
* maint: GIT-VERSION-FILE: check ./version first. sha1_file.c: Round the mmap offset to half the window size. Make sure packedgitwindowsize is multiple of (pagesize * 2) Add RelNotes 1.5.0.1 Still updating 1.5.0 release notes. git-daemon: Avoid leaking the listening sockets into child processes. Clarify two backward incompatible repository options.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.0.1.txt20
-rw-r--r--Documentation/RelNotes-1.5.0.txt15
2 files changed, 29 insertions, 6 deletions
diff --git a/Documentation/RelNotes-1.5.0.1.txt b/Documentation/RelNotes-1.5.0.1.txt
new file mode 100644
index 000000000..982282a89
--- /dev/null
+++ b/Documentation/RelNotes-1.5.0.1.txt
@@ -0,0 +1,20 @@
+GIT v1.5.0.1 Release Notes
+==========================
+
+Fixes since v1.5.0
+------------------
+
+* Documentation updates
+
+ - Clarifications and corrections to 1.5.0 release notes.
+ - The main documentation did not link to git-remote documentation.
+
+* Bugfixes
+
+ - git-daemon marks the listening sockets with FD_CLOEXEC so
+ that it won't be leaked into the children.
+
+--
+O=v1.5.0-7-g37b73cf
+echo O=`git describe maint`
+git shortlog --no-merges $O..
diff --git a/Documentation/RelNotes-1.5.0.txt b/Documentation/RelNotes-1.5.0.txt
index f0120e1f5..599efb8c9 100644
--- a/Documentation/RelNotes-1.5.0.txt
+++ b/Documentation/RelNotes-1.5.0.txt
@@ -25,12 +25,18 @@ Specifically, the available options are:
older clients over dumb transports (e.g. http) using older
versions of git will also be affected.
+ To let git use the new loose object format, you have to
+ set core.legacyheaders to false.
+
- Since v1.4.3, configuration repack.usedeltabaseoffset allows
packfile to be created in more space efficient format, which
cannot be read by git older than that version.
-The above two are not enabled by default and you explicitly have
-to ask for them, because these two features make repositories
+ To let git use the new format for packfiles, you have to
+ set repack.usedeltabaseoffset to true.
+
+The above two new features are not enabled by default and you
+have to explicitly ask for them, because they make repositories
unreadable by older versions of git, and in v1.5.0 we still do
not enable them by default for the same reason. We will change
this default probably 1 year after 1.4.2's release, when it is
@@ -217,7 +223,7 @@ Updates in v1.5.0 since v1.4.4 series
"branch@{Nth}" notation.
- "git show-branch" learned showing the reflog data with the
- new -g option. "git log" has -s option to view reflog
+ new -g option. "git log" has -g option to view reflog
entries in a more verbose manner.
- git-branch knows how to rename branches and moves existing
@@ -253,9 +259,6 @@ Updates in v1.5.0 since v1.4.4 series
above sentence, as git-prune does not remove things reachable
from reflog entries.
- - 'git-prune' by default does not remove _everything_
- unreachable, as there is a one-day grace period built-in.
-
- There is a toplevel garbage collector script, 'git-gc', that
runs periodic cleanup functions, including 'git-repack -a -d',
'git-reflog expire', 'git-pack-refs --prune', and 'git-rerere