X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2FRelNotes-1.6.1.txt;h=adb7ccab0a4dc3895f46a1cff840988554f62ec4;hb=bd9efbf35424c9436f62768e47f5819c9b5bcf9e;hp=002d9ec68115157a304ffe58d9b113c0f8f34d1d;hpb=768c728e7c706ab8d39e0dbf2aa4d1a465930728;p=git.git

diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt
index 002d9ec68..adb7ccab0 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