summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-06 20:50:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-08-06 20:50:48 (GMT)
commitf44bc33c7283c19a86797ffdaafd22a19bbdfbd6 (patch)
tree9e33941160873fda6e65de8c94fa3a4178631c0f /Documentation
parentd96ca27e1089a190139591ac365873f26bffcf5c (diff)
parent781c1834f5419bdf81bb7f3750170ccd6b809174 (diff)
downloadgit-f44bc33c7283c19a86797ffdaafd22a19bbdfbd6.zip
git-f44bc33c7283c19a86797ffdaafd22a19bbdfbd6.tar.gz
git-f44bc33c7283c19a86797ffdaafd22a19bbdfbd6.tar.bz2
Sync with 1.5.6.5
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes-1.5.6.5.txt9
-rw-r--r--Documentation/git-diff-tree.txt6
-rw-r--r--Documentation/git.txt3
3 files changed, 8 insertions, 10 deletions
diff --git a/Documentation/RelNotes-1.5.6.5.txt b/Documentation/RelNotes-1.5.6.5.txt
index 23981ac..47ca172 100644
--- a/Documentation/RelNotes-1.5.6.5.txt
+++ b/Documentation/RelNotes-1.5.6.5.txt
@@ -6,6 +6,9 @@ Fixes since v1.5.6.4
* "git cvsimport" used to spit out "UNKNOWN LINE..." diagnostics to stdout.
+* "git commit -F filename" and "git tag -F filename" run from subdirectories
+ did not read the right file.
+
* "git init --template=" with blank "template" parameter linked files
under root directories to .git, which was a total nonsense. Instead, it
means "I do not want to use anything from the template directory".
@@ -24,9 +27,3 @@ Fixes since v1.5.6.4
header properly.
Contains other various documentation fixes.
-
---
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.5.6.4-26-g2b6ca6d
-git shortlog --no-merges $O..maint
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 8c8f35b..1fdf20d 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -49,13 +49,13 @@ include::diff-options.txt[]
--stdin::
When '--stdin' is specified, the command does not take
<tree-ish> arguments from the command line. Instead, it
- reads either one <commit> or a pair of <tree-ish>
+ reads either one <commit> or a list of <commit>
separated with a single space from its standard input.
+
When a single commit is given on one line of such input, it compares
the commit with its parents. The following flags further affects its
-behavior. This does not apply to the case where two <tree-ish>
-separated with a single space are given.
+behavior. The remaining commits, when given, are used as if they are
+parents of the first commit.
-m::
By default, 'git-diff-tree --stdin' does not show
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 3da5bf0..b1cb972 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* link:v1.5.6.4/git.html[documentation for release 1.5.6.4]
+* link:v1.5.6.5/git.html[documentation for release 1.5.6.5]
* release notes for
+ link:RelNotes-1.5.6.5.txt[1.5.6.5],
link:RelNotes-1.5.6.4.txt[1.5.6.4],
link:RelNotes-1.5.6.3.txt[1.5.6.3],
link:RelNotes-1.5.6.2.txt[1.5.6.2],