Sync with 1.5.6.5

This commit is contained in:
Junio C Hamano
2008-08-06 13:50:42 -07:00
9 changed files with 80 additions and 15 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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],