Skip to content

Commit 42817b9

Browse files
committed
Git 1.8.5-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 05ad292 commit 42817b9

File tree

2 files changed

+24
-1
lines changed

2 files changed

+24
-1
lines changed

Documentation/RelNotes/1.8.5.txt

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,29 @@ Unless otherwise noted, all the fixes since v1.8.4 in the maintenance
244244
track are contained in this release (see release notes to them for
245245
details).
246246

247+
* Coloring around octopus merges in "log --graph" output was screwy.
248+
(merge 339c17b hn/log-graph-color-octopus later to maint).
249+
250+
* "git checkout topic", when there is not yet a local "topic" branch
251+
but there is a unique remote-tracking branch for a remote "topic"
252+
branch, pretended as if "git checkout -t -b topic remote/$r/topic"
253+
(for that unique remote $r) was run. This hack however was not
254+
implemented for "git checkout topic --".
255+
(merge bca3969 mm/checkout-auto-track-fix later to maint).
256+
257+
* One long-standing flaw in the pack transfer protocol used by "git
258+
clone" was that there was no way to tell the other end which branch
259+
"HEAD" points at, and the receiving end needed to guess. A new
260+
capability has been defined in the pack protocol to convey this
261+
information so that cloning from a repository with more than one
262+
branches pointing at the same commit where the HEAD is at now
263+
reliably sets the initial branch in the resulting repository.
264+
(merge 360a326 jc/upload-pack-send-symref later to maint).
265+
266+
* We did not handle cases where http transport gets redirected during
267+
the authorization request (e.g. from http:// to https://).
268+
(merge 70900ed jk/http-auth-redirects later to maint).
269+
247270
* Bash prompting code to deal with an SVN remote as an upstream
248271
were coded in a way not supported by older Bash versions (3.x).
249272
(merge 52ec889 sg/prompt-svn-remote-fix later to maint).

GIT-VERSION-GEN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
GVF=GIT-VERSION-FILE
4-
DEF_VER=v1.8.4.GIT
4+
DEF_VER=v1.8.5-rc0
55

66
LF='
77
'

0 commit comments

Comments
 (0)