aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-29 01:17:34 -0800
committerJunio C Hamano <gitster@pobox.com>2008-12-29 01:17:34 -0800
commit936b7057e8401665a2d106e8de018561db6333fe (patch)
tree949642b2cf7b13a620bbbc09b357313847a6d200
parenta9e67c8ccc6958d09c575a3d4837a49d8a2ec7d5 (diff)
downloadgit-936b7057e8401665a2d106e8de018561db6333fe.tar.gz
git-936b7057e8401665a2d106e8de018561db6333fe.tar.xz
Prepare for v1.6.1.1 maintenance release
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt23
l---------RelNotes2
2 files changed, 24 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.6.1.1.txt b/Documentation/RelNotes-1.6.1.1.txt
new file mode 100644
index 000000000..10b38e6ec
--- /dev/null
+++ b/Documentation/RelNotes-1.6.1.1.txt
@@ -0,0 +1,23 @@
+GIT v1.6.1.1 Release Notes
+==========================
+
+Fixes since v1.6.1
+------------------
+
+* "git describe --all" complained when a commit is described with a tag,
+ which was nonsense.
+
+* "git log --pretty=format:%s" did not handle a multi-line subject the
+ same way as built-in log listers (i.e. shortlog, --pretty=oneline, etc.)
+
+* "git daemon", and "git merge-file" are more careful when freopen fails
+ and barf, instead of going on and writing to unopened filehandle.
+
+Other documentation fixes.
+
+---
+exec >/var/tmp/1
+O=v1.6.1-15-ga9e67c8
+echo O=$(git describe maint)
+git shortlog --no-merges $O..maint
+
diff --git a/RelNotes b/RelNotes
index 3d420845b..2ebf251dd 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.6.1.txt \ No newline at end of file
+Documentation/RelNotes-1.6.1.1.txt \ No newline at end of file