GIT 1.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 24, 2008 at 19:41 UTC
8104ebfe8276657ee803cca7eb8665a78cf3ef83
2 files changed
+9
Documentation/RelNotes-1.6.1.txt
+4
@@ -255,6 +255,10 @@ release, unless otherwise noted.
255
when acquiring a lock from the server (this may need to be backported to
256
older releases later).
257
258
+* After "git rebase -p" stopped with conflicts while replaying a merge,
259
+ "git rebase --continue" did not work (may need to be backported to older
260
+ releases).
261
+
262
* "git revert" records relative to which parent a revert was made when
263
reverting a merge. Together with new documentation that explains issues
264
around reverting a merge and merging from the updated branch later, this
Documentation/git.txt
+5
@@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master'
43
branch of the `git.git` repository.
44
Documentation for older releases are available here:
45
46
+* link:v1.6.1/git.html[documentation for release 1.6.1]
47
+
48
+* release notes for
49
+ link:RelNotes-1.6.1.txt[1.6.1].
50
+
51
* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
52
53
* release notes for