summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2014-10-26 22:37:01 -0400
committerEdward Thomson <ethomson@microsoft.com>2014-10-26 22:59:53 -0400
commit679172812c47de5af01fd1c9987dee855dfa9b08 (patch)
treefcb7668ff57891355fb50c8837f6fbb1d31cb245
parent979645a7195b8ce9895c18ee00c8913ea38f93eb (diff)
downloadlibgit2-ed/rebase.tar.gz
rebase: add information to the CHANGELOGed/rebase
-rw-r--r--CHANGELOG.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e076dd5ab..93b189c05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -90,3 +90,17 @@ v0.21 + 1
* Introduce git_merge_bases_many() to expose all merge bases between
multiple commits.
+
+* git_merge_head is now git_annotated_commit, to better reflect its usage
+ for multiple functions (including rebase)
+
+* Introduce rebase functionality (using the merge algorithm only).
+ Introduce git_rebase_init() to begin a new rebase session,
+ git_rebase_open() to open an in-progress rebase session,
+ git_rebase_commit() to commit the current rebase operation,
+ git_rebase_next() to apply the next rebase operation,
+ git_rebase_abort() to abort an in-progress rebase and git_rebase_finish()
+ to complete a rebase operation.
+
+* Introduce git_note_author() and git_note_committer() to get the author
+ and committer information on a git_note, respectively.