undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  Update draft release notes to 1.7.5.2
  Documentation/git-fsck.txt: fix typo: unreadable -> unreachable
This commit is contained in:
Junio C Hamano 2011-05-16 16:44:57 -07:00
commit 6c7471bcf1
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Documentation/RelNotes/1.7.5.2.txt
View File

@ -12,6 +12,13 @@ The release notes to 1.7.5.1 forgot to mention:
Fixes since v1.7.5.1
--------------------
* "git add -p" did not work correctly when a hunk is split and then
one of them was given to the editor.
* "git add -u" did not resolve a conflict where our history deleted and
their history modified the same file, and the working tree resolved to
keep a file.
* "git cvsimport" did not know that CVSNT stores its password file in a
location different from the traditional CVS.
@ -21,6 +28,10 @@ Fixes since v1.7.5.1
* "git diff -M --cached" used to use unmerged path as a possible rename
source candidate, which made no sense.
* The option name parser in "git fast-import" used prefix matches for
some options where it shouldn't, and accepted non-existent options,
e.g. "--relative-marksmith" or "--forceps".
* "git format-patch" did not quote RFC822 special characters in the
email address (e.g From: Junio C. Hamano <jch@example.com>, not
From: "Junio C. Hamano" <jch@example.com>).
@ -28,6 +39,10 @@ Fixes since v1.7.5.1
* "git format-patch" when run with "--quiet" option used to produce a
nonsense result that consists of alternating empty output.
* In "git merge", per-branch branch.<name>.mergeoptions configuration
variables did not override the fallback default merge.<option>
configuration variables such as merge.ff, merge.log, etc.
* "git merge-one-file" did not honor GIT_WORK_TREE settings when
handling a "both sides added, differently" conflict.

4
Documentation/git-fsck.txt
View File

@ -26,7 +26,7 @@ index file, all SHA1 references in .git/refs/*, and all reflogs (unless
--no-reflogs is given) as heads.
--unreachable::
Print out objects that exist but that aren't readable from any
Print out objects that exist but that aren't reachable from any
of the reference nodes.
--root::
@ -76,7 +76,7 @@ It tests SHA1 and general object sanity, and it does full tracking of
the resulting reachability and everything else. It prints out any
corruption it finds (missing or bad objects), and if you use the
'--unreachable' flag it will also print out objects that exist but
that aren't readable from any of the specified head nodes.
that aren't reachable from any of the specified head nodes.
So for example