Skip to content

Commit 8104ebf

Browse files
committed
GIT 1.6.1
Signed-off-by: Junio C Hamano <[email protected]>
1 parent 768c728 commit 8104ebf

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

Documentation/RelNotes-1.6.1.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,10 @@ release, unless otherwise noted.
255255
when acquiring a lock from the server (this may need to be backported to
256256
older releases later).
257257

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+
258262
* "git revert" records relative to which parent a revert was made when
259263
reverting a merge. Together with new documentation that explains issues
260264
around reverting a merge and merging from the updated branch later, this

Documentation/git.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master'
4343
branch of the `git.git` repository.
4444
Documentation for older releases are available here:
4545

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+
4651
* link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
4752

4853
* release notes for

0 commit comments

Comments
 (0)