mirror of
https://github.com/git/git.git
synced 2024-10-30 13:57:54 +01:00
Sync with 1.7.0.5
This commit is contained in:
commit
7b575f3c38
4 changed files with 39 additions and 11 deletions
26
Documentation/RelNotes-1.7.0.5.txt
Normal file
26
Documentation/RelNotes-1.7.0.5.txt
Normal file
|
@ -0,0 +1,26 @@
|
|||
Git v1.7.0.5 Release Notes
|
||||
==========================
|
||||
|
||||
Fixes since v1.7.0.4
|
||||
--------------------
|
||||
|
||||
* "git daemon" failed to compile on platforms without sockaddr_storage type.
|
||||
|
||||
* Output from "git rev-list --pretty=oneline" was unparsable when a
|
||||
commit did not have any message, which is abnormal but possible in a
|
||||
repository converted from foreign scm.
|
||||
|
||||
* "git stash show <commit-that-is-not-a-stash>" gave an error message
|
||||
that was not so useful. Reworded the message to "<it> is not a
|
||||
stash".
|
||||
|
||||
* Python scripts in contrib/ area now start with "#!/usr/bin/env python"
|
||||
to honor user's PATH.
|
||||
|
||||
* "git imap-send" used to mistake any line that begins with "From " as a
|
||||
message separator in format-patch output.
|
||||
|
||||
* Smart http server backend failed to report an internal server error and
|
||||
infinitely looped instead after output pipe was closed.
|
||||
|
||||
And other minor fixes and documentation updates.
|
|
@ -79,14 +79,15 @@ of lines before or after the line given by <start>.
|
|||
of the --date option at linkgit:git-log[1].
|
||||
|
||||
-M|<num>|::
|
||||
Detect moving lines in the file as well. When a commit
|
||||
moves a block of lines in a file (e.g. the original file
|
||||
has A and then B, and the commit changes it to B and
|
||||
then A), the traditional 'blame' algorithm typically blames
|
||||
the lines that were moved up (i.e. B) to the parent and
|
||||
assigns blame to the lines that were moved down (i.e. A)
|
||||
to the child commit. With this option, both groups of lines
|
||||
are blamed on the parent.
|
||||
Detect moved or copied lines within a file. When a commit
|
||||
moves or copies a block of lines (e.g. the original file
|
||||
has A and then B, and the commit changes it to B and then
|
||||
A), the traditional 'blame' algorithm notices only half of
|
||||
the movement and typically blames the lines that were moved
|
||||
up (i.e. B) to the parent and assigns blame to the lines that
|
||||
were moved down (i.e. A) to the child commit. With this
|
||||
option, both groups of lines are blamed on the parent by
|
||||
running extra passes of inspection.
|
||||
+
|
||||
<num> is optional but it is the lower bound on the number of
|
||||
alphanumeric characters that git must detect as moving
|
||||
|
@ -94,7 +95,7 @@ within a file for it to associate those lines with the parent
|
|||
commit.
|
||||
|
||||
-C|<num>|::
|
||||
In addition to `-M`, detect lines copied from other
|
||||
In addition to `-M`, detect lines moved or copied from other
|
||||
files that were modified in the same commit. This is
|
||||
useful when you reorganize your program and move code
|
||||
around across files. When this option is given twice,
|
||||
|
|
|
@ -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.7.0.4/git.html[documentation for release 1.7.0.4]
|
||||
* link:v1.7.0.5/git.html[documentation for release 1.7.0.5]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes-1.7.0.5.txt[1.7.0.5],
|
||||
link:RelNotes-1.7.0.4.txt[1.7.0.4],
|
||||
link:RelNotes-1.7.0.3.txt[1.7.0.3],
|
||||
link:RelNotes-1.7.0.2.txt[1.7.0.2],
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
|
||||
GVF=GIT-VERSION-FILE
|
||||
DEF_VER=v1.7.0.4
|
||||
DEF_VER=v1.7.1.rc1.GIT
|
||||
|
||||
LF='
|
||||
'
|
||||
|
|
Loading…
Reference in a new issue