diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-18 01:05:53 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-18 01:05:53 +0400 |
| commit | a890c998de36b8460267b42779bbe34bad9c36d7 (patch) | |
| tree | 87c4c01586ad76145f6afcf3fb837e1952fba236 | |
| parent | 7dba3f73e9571963fa03549956879d15ca7ad2d3 (diff) | |
| parent | 785ee4960c3d334cbc2b17ab74d2cebdf1b4db64 (diff) | |
Sync with 1.7.10.5
| -rw-r--r-- | Documentation/RelNotes/1.7.10.5.txt | 12 | ||||
| -rw-r--r-- | Documentation/git.txt | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Documentation/RelNotes/1.7.10.5.txt b/Documentation/RelNotes/1.7.10.5.txt new file mode 100644 index 0000000000..4db1770e38 --- /dev/null +++ b/Documentation/RelNotes/1.7.10.5.txt @@ -0,0 +1,12 @@ +Git v1.7.10.5 Release Notes +=========================== + +Fixes since v1.7.10.4 +--------------------- + + * "git fast-export" did not give a readable error message when the + same mark erroneously appeared twice in the --import-marks input. + + * "git rebase -p" used to pay attention to rebase.autosquash which + was wrong. "git rebase -p -i" should, but "git rebase -p" by + itself should not. diff --git a/Documentation/git.txt b/Documentation/git.txt index 55e405d644..682fec5677 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.10.4/git.html[documentation for release 1.7.10.4] +* link:v1.7.10.5/git.html[documentation for release 1.7.10.5] * release notes for + link:RelNotes/1.7.10.5.txt[1.7.10.5], link:RelNotes/1.7.10.4.txt[1.7.10.4], link:RelNotes/1.7.10.3.txt[1.7.10.3], link:RelNotes/1.7.10.2.txt[1.7.10.2], |