diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-24 19:41:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-24 19:41:08 -0800 |
| commit | 8104ebfe8276657ee803cca7eb8665a78cf3ef83 (patch) | |
| tree | a2c0eea09a6e5cd565ebd75b77f2634682ef59c7 /Documentation/RelNotes-1.6.1.txt | |
| parent | Merge branch 'js/rebase-i-p' (diff) | |
| download | tgif-8104ebfe8276657ee803cca7eb8665a78cf3ef83.tar.xz | |
GIT 1.6.1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes-1.6.1.txt')
| -rw-r--r-- | Documentation/RelNotes-1.6.1.txt | 4 |
1 files changed, 4 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 |