From 81143a87ecb1c913801a56d1cb3e7cc43f2bb53a Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Fri, 14 Oct 2011 14:04:08 +0100 Subject: [PATCH] Patched Git v1.7.7 Signed-off-by: Pat Thoyts --- git | 2 +- share/WinGit/ReleaseNotes.rtf | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/git b/git index 5f4d3f50..e59f1619 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit 5f4d3f50f6365ee0a0a64726995459981754fb56 +Subproject commit e59f1619d0eb9ed2d3c54b8fb83518c71e9f32b4 diff --git a/share/WinGit/ReleaseNotes.rtf b/share/WinGit/ReleaseNotes.rtf index d8e8fd34..6612e749 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.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 +{\*\generator Msftedit 5.41.21.2510;}\viewkind4\uc1\pard\cf1\lang1033\b\f0\fs32 Git Release Notes (Git-1.7.7-preview20111014)\b0\fs20\par +Last update: 14 October 2011\par \par \b\fs24 Introduction\b0\fs20\par \par @@ -34,6 +34,8 @@ Bugfixes\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 +{\pntext\f2\'B7\tab}Fixed installation of mergetools for difftool and mergetool use and launching of beyond compare on windows.\par +{\pntext\f2\'B7\tab}Fixed warning about mising hostname during git fetch\par \pard\b\fs24\par Changes since Git-1.7.4-preview20110211\par \par -- 2.11.4.GIT