From 96e245cd657666bb489d1aa32c96515bd4a23e40 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Wed, 12 Oct 2011 13:33:56 +0100 Subject: [PATCH] Updated to Git v1.7.7 Signed-off-by: Pat Thoyts --- doc/git/html | 2 +- git | 2 +- share/WinGit/ReleaseNotes.rtf | 17 +++++++++++++++-- src/git-cheetah | 2 +- 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/doc/git/html b/doc/git/html index 708376e8..8fb66e50 160000 --- a/doc/git/html +++ b/doc/git/html @@ -1 +1 @@ -Subproject commit 708376e8576f6d39b62b27ee9dfe7292c652f728 +Subproject commit 8fb66e5074d5cdeeb08e304be977374501a0787d diff --git a/git b/git index a03ceba6..5f4d3f50 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit a03ceba68830fd5112ce33db7f933e763ffdf7f2 +Subproject commit 5f4d3f50f6365ee0a0a64726995459981754fb56 diff --git a/share/WinGit/ReleaseNotes.rtf b/share/WinGit/ReleaseNotes.rtf index bbdaa055..d8e8fd34 100644 --- a/share/WinGit/ReleaseNotes.rtf +++ b/share/WinGit/ReleaseNotes.rtf @@ -1,7 +1,7 @@ {\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\fswiss\fprq2\fcharset0 Arial;}{\f1\fnil\fcharset0 Arial;}{\f2\fnil\fcharset2 Symbol;}} {\colortbl ;\red0\green0\blue0;\red0\green0\blue255;} -{\*\generator Msftedit 5.41.21.2509;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.6-preview20110708)\b0\fs20\par -Last update: 8 July 2011\par +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.7-preview20111012)\b0\fs20\par +Last update: 12 October 2011\par \par \b\fs24 Introduction\b0\fs20\par \par @@ -22,6 +22,19 @@ See \cf0{\field{\*\fldinst{HYPERLINK "http://git-scm.com/"}}{\fldrslt{\ul\cf2 ht {\pntext\f2\'B7\tab}As merge tools are executed using the MSys bash, options starting with "/" need to be handled specially: MSys would interpret that as a POSIX path, so you need to double the slash (Issue 226). Example: instead of "/base", say "//base". Also, extra care has to be paid to pass Windows programs Windows paths, as they have no clue about MSys style POSIX paths -- You can use something like $(cmd //c echo "$POSIXPATH").\par {\pntext\f2\'B7\tab}Unless you define the environment variable MSYS_WATCH_FSTAB (the value must be a non-empty string), Git Bash will not see any drives that have been attached after bash was started. This is a workaround to help the speed of cmd scripts using parts of Git that are implemented as shell scripts.\par \pard\b\fs24\par +Changes since Git-1.7.6-preview20110708\par +\par +\i\fs20 New Features\par +\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Comes with Git 1.7.7 plus patches.\par +{\pntext\f2\'B7\tab}Updated gzip/gunzip and include unzip and gvim\par +{\pntext\f2\'B7\tab}Primary repositories moved to github.com at \cf0{\field{\*\fldinst{HYPERLINK "http://github.com/msysgit/"}}{\fldrslt{\ul\cf2 http://github.com/msysgit/}}}\cf1\f0\fs20\par +\pard\b\i\par +Bugfixes\par +\pard{\pntext\f2\'B7\tab}{\*\pn\pnlvlblt\pnf2\pnindent0{\pntxtb\'B7}}\fi-288\li432\b0\i0 Please refer to the release notes for official Git 1.7.7\par +{\pntext\f2\'B7\tab}Re-enable vim highlighting\par +{\pntext\f2\'B7\tab}Fixed issue with libiconv/libiconv-2 location\par +{\pntext\f2\'B7\tab}Fixed regressions in Git Bash script\par +\pard\b\fs24\par Changes since Git-1.7.4-preview20110211\par \par \i\fs20 New Features\par diff --git a/src/git-cheetah b/src/git-cheetah index 0cf821c7..f25bd0a0 160000 --- a/src/git-cheetah +++ b/src/git-cheetah @@ -1 +1 @@ -Subproject commit 0cf821c7fadabb7522c92d4371dcff2fe8d4b34f +Subproject commit f25bd0a07f877a3d85986bd7c7be3f464c99a064 -- 2.11.4.GIT