diff options
| -rw-r--r-- | Documentation/RelNotes/2.4.8.txt | 21 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 |
3 files changed, 24 insertions, 4 deletions
diff --git a/Documentation/RelNotes/2.4.8.txt b/Documentation/RelNotes/2.4.8.txt new file mode 100644 index 0000000000..ad946b2673 --- /dev/null +++ b/Documentation/RelNotes/2.4.8.txt @@ -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. diff --git a/Documentation/git.txt b/Documentation/git.txt index f4cb5cb200..5e0397a448 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -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], diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index cd96820162..5cadf44e1a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -38,5 +38,3 @@ test "$VN" = "$VC" || { echo >&2 "GIT_VERSION = $VN" echo "GIT_VERSION = $VN" >$GVF } - - |