aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.0.6.txt22
-rw-r--r--Documentation/git-log.txt5
-rw-r--r--Documentation/git.txt4
3 files changed, 30 insertions, 1 deletions
diff --git a/Documentation/RelNotes-1.5.0.6.txt b/Documentation/RelNotes-1.5.0.6.txt
new file mode 100644
index 000000000..e15447ffd
--- /dev/null
+++ b/Documentation/RelNotes-1.5.0.6.txt
@@ -0,0 +1,22 @@
+GIT v1.5.0.6 Release Notes
+==========================
+
+Fixes since v1.5.0.5
+--------------------
+
+* Bugfixes
+
+ - a handful small fixes to gitweb.
+
+ - build procedure for user-manual is fixed not to require locally
+ installed stylesheets.
+
+ - "git commit $paths" on paths whose earlier contents were
+ already updated in the index were failing out.
+
+* Documentation
+
+ - user-manual has better cross references.
+
+ - gitweb installation/deployment procedure is now documented.
+
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 361eaec70..030edaf30 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -38,6 +38,11 @@ include::pretty-formats.txt[]
and <until>, see "SPECIFYING REVISIONS" section in
gitlink:git-rev-parse[1].
+--first-parent::
+ Follow only the first parent commit upon seeing a merge
+ commit. This option gives a better overview of the
+ evolution of a particular branch.
+
-p::
Show the change the commit introduces in a patch form.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 31397dc53..dceacfac1 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -35,7 +35,9 @@ ifdef::stalenotes[]
You are reading the documentation for the latest version of git.
Documentation for older releases are available here:
-* link:v1.5.0.5/git.html[documentation for release 1.5.0.5]
+* link:v1.5.0.6/git.html[documentation for release 1.5.0.6]
+
+* link:v1.5.0.6/RelNotes-1.5.0.6.txt[release notes for 1.5.0.6]
* link:v1.5.0.5/RelNotes-1.5.0.5.txt[release notes for 1.5.0.5]