summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-10-02 13:47:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-10-02 13:47:30 -0700
commitb65f30b6b3bf34831b32a1b209bc1955f2bf79df (patch)
tree54e218dfb1622a29a04b42277dcb58ab5267e936
parentDocumentation: mention `push.default` in git-push.txt (diff)
parentStart preparing for 1.7.12.3 (diff)
downloadtgif-b65f30b6b3bf34831b32a1b209bc1955f2bf79df.tar.xz
Merge branch 'maint'
-rw-r--r--Documentation/RelNotes/1.7.12.3.txt18
-rw-r--r--po/sv.po2
2 files changed, 19 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.12.3.txt b/Documentation/RelNotes/1.7.12.3.txt
new file mode 100644
index 0000000000..8d4f879458
--- /dev/null
+++ b/Documentation/RelNotes/1.7.12.3.txt
@@ -0,0 +1,18 @@
+Git 1.7.12.3 Release Notes
+==========================
+
+Fixes since v1.7.12.2
+---------------------
+
+ * "git fetch" over http had an old workaround for an unlikely server
+ misconfiguration; it turns out that this hurts debuggability of the
+ configuration in general, and has been reverted.
+
+ * "git fetch" over http advertised that it supports "deflate", which
+ is much less common, and did not advertise the more common "gzip" on
+ its Accept-Encoding header.
+
+ * "git status" honored the ignore=dirty settings in .gitmodules but
+ "git commit" didn't.
+
+Also contains a handful of documentation updates.
diff --git a/po/sv.po b/po/sv.po
index 52282395c9..7ce7e581d9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: git 1.7.12\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-09-15 10:21+0800\n"
-"PO-Revision-Date: 2012-09-21 08:06+0100\n"
+"PO-Revision-Date: 2012-10-02 08:15+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"