diff options
| -rw-r--r-- | Documentation/RelNotes-1.6.1.txt | 4 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt index 002d9ec681..adb7ccab0a 100644 --- a/Documentation/RelNotes-1.6.1.txt +++ b/Documentation/RelNotes-1.6.1.txt @@ -255,6 +255,10 @@ release, unless otherwise noted. when acquiring a lock from the server (this may need to be backported to older releases later). +* After "git rebase -p" stopped with conflicts while replaying a merge, + "git rebase --continue" did not work (may need to be backported to older + releases). + * "git revert" records relative to which parent a revert was made when reverting a merge. Together with new documentation that explains issues around reverting a merge and merging from the updated branch later, this diff --git a/Documentation/git.txt b/Documentation/git.txt index 2c0c23003f..17dc8b2019 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.6.1/git.html[documentation for release 1.6.1] + +* release notes for + link:RelNotes-1.6.1.txt[1.6.1]. + * link:v1.6.0.6/git.html[documentation for release 1.6.0.6] * release notes for |