mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge the attributes fix in from maint-1.6.6 branch

Browse Source 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2012-01-10 14:14:26 -08:00
parent 8769e93327 f14f9803ef
commit 6c65b5ea43
4 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/RelNotes/1.7.6.6.txt Normal file
View File

@ -0,0 +1,11 @@
Git v1.7.6.6 Release Notes
==========================
Fixes since v1.7.6.5
--------------------
* The code to look up attributes for paths reused entries from a wrong
directory when two paths in question are in adjacent directories and
the name of the one directory is a prefix of the other.
Also contains minor fixes and documentation updates.

3
Documentation/config.txt
View File

@ -1711,7 +1711,8 @@ rerere.enabled::
conflict hunks can be resolved automatically, should they be
encountered again. By default, linkgit:git-rerere[1] is
enabled if there is an `rr-cache` directory under the
`$GIT_DIR`.
`$GIT_DIR`, e.g. if "rerere" was previously used in the
repository.
sendemail.identity::
A configuration identity. When given, causes values in the