GIT 1.6.1

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt
index 002d9ec68115157a304ffe58d9b113c0f8f34d1d..adb7ccab0a4dc3895f46a1cff840988554f62ec4 100644 (file)
--- 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).
 
   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
 * "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 2c0c23003f74eb72927cc6ecff98247c0894a15c..17dc8b20192f2558775250436152d0e8acfde41e 100644 (file)
--- 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:
 
 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
 * link:v1.6.0.6/git.html[documentation for release 1.6.0.6]
 
 * release notes for