mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-08 20:36:19 +02:00
Code

Sync with maint 

* maint:
  Git 2.4.8
This commit is contained in:
Junio C Hamano 2015-08-03 11:20:07 -07:00
parent eb67052b13 e88b8586bf
commit efc8a625e9
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Documentation/RelNotes/2.4.8.txt Normal file
View File

@ -0,0 +1,21 @@
Git v2.4.8 Release Notes
========================
Fixes since v2.4.7
------------------
* Abandoning an already applied change in "git rebase -i" with
"--continue" left CHERRY_PICK_HEAD and confused later steps.
* Various fixes around "git am" that applies a patch to a history
that is not there yet.
* "git for-each-ref" reported "missing object" for 0{40} when it
encounters a broken ref. The lack of object whose name is 0{40} is
not the problem; the ref being broken is.
* "git commit --cleanup=scissors" was not careful enough to protect
against getting fooled by a line that looked like scissors.
Also contains typofixes, documentation updates and trivial code
clean-ups.

5
Documentation/git.txt
View File

@ -46,11 +46,12 @@ Documentation for older releases are available here:
* link:v2.5.0/git.html[documentation for release 2.5]
* release notes for
link:RelNotes/2.5.0.txt[2.5],
link:RelNotes/2.5.0.txt[2.5].
* link:v2.4.7/git.html[documentation for release 2.4.7]
* link:v2.4.8/git.html[documentation for release 2.4.8]
* release notes for
link:RelNotes/2.4.8.txt[2.4.8],
link:RelNotes/2.4.7.txt[2.4.7],
link:RelNotes/2.4.6.txt[2.4.6],
link:RelNotes/2.4.5.txt[2.4.5],

2
GIT-VERSION-GEN
View File

@ -38,5 +38,3 @@ test "$VN" = "$VC" || {
echo >&2 "GIT_VERSION = $VN"
echo "GIT_VERSION = $VN" >$GVF
}