Skip to content

Commit de0977d

Browse files
committed
Update draft release notes to 1.8.3
Signed-off-by: Junio C Hamano <[email protected]>
1 parent e7a3c90 commit de0977d

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

Documentation/RelNotes/1.8.3.txt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ Foreign interface
4646

4747
UI, Workflows & Features
4848

49+
* The prompt string generator (in contrib/completion/) learned to
50+
show how many changes there are in total and how many have been
51+
replayed during a "git rebase" session.
52+
4953
* "git branch --vv" learned to paint the name of the branch it
5054
integrates with in a different color (color.branch.upstream,
5155
which defaults to blue).
@@ -158,9 +162,9 @@ UI, Workflows & Features
158162

159163
* "git difftool" allows the user to write into the temporary files
160164
being shown; if the user makes changes to the working tree at the
161-
same time, one of the changes has to be lost in such a case, but it
162-
tells the user what happened and refrains from overwriting the copy
163-
in the working tree.
165+
same time, it now refrains from overwriting the copy in the working
166+
tree and leaves the temporary file so that changes can be merged
167+
manually.
164168

165169
* There was no good way to ask "I have a random string that came from
166170
outside world. I want to turn it into a 40-hex object name while
@@ -224,6 +228,15 @@ Unless otherwise noted, all the fixes since v1.8.2 in the maintenance
224228
track are contained in this release (see release notes to them for
225229
details).
226230

231+
* Recent versions of File::Temp (used by "git svn") started blowing
232+
up when its tempfile sub is called as a class method; updated the
233+
callsite to call it as a plain vanilla function to fix it.
234+
(merge eafc2dd hb/git-pm-tempfile later to maint).
235+
236+
* Various subcommands of "git remote" simply ignored extraneous
237+
command line arguments instead of diagnosing them as errors.
238+
(merge b17dd3f tr/remote-tighten-commandline-parsing later to maint).
239+
227240
* When receive-pack detects an error in the pack header it received in
228241
order to decide which of unpack-objects or index-pack to run, it
229242
returned without closing the error stream, which led to a hung

0 commit comments

Comments
 (0)