Skip to content

Commit

Permalink
Git 2.4.8
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Aug 3, 2015
1 parent 29dce32 commit 8545932
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 5 deletions.
21 changes: 21 additions & 0 deletions Documentation/RelNotes/2.4.8.txt
Original file line number Diff line number Diff line change
@@ -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.
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:

* 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],
Expand Down
4 changes: 1 addition & 3 deletions GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v2.4.7
DEF_VER=v2.4.8

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


2 changes: 1 addition & 1 deletion RelNotes

0 comments on commit 8545932

Please sign in to comment.