summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2015-03-17 17:53:07 -0400
committerEdward Thomson <ethomson@microsoft.com>2015-04-20 16:22:39 -0400
commiteaf0d68830cc8fc56c92733a550ea5f6bc15101d (patch)
tree43cb07a2686a3dcc346c49a8dac03ad1aa52b9b5 /CHANGELOG.md
parent49b3ddf2167156352eabce9a169fa6649b900631 (diff)
downloadlibgit2-eaf0d68830cc8fc56c92733a550ea5f6bc15101d.tar.gz
rebase: block rebase_commit with unstaged changes
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69c69912d..b7d4aa497 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,9 @@ v0.22 + 1
allow for specifying the expression from the user to be put into the
reflog.
+* `git_rebase_commit` now return `GIT_EUNMERGED` when you attempt to
+ commit with unstaged changes.
+
### API additions
* The `git_merge_options` gained a `file_flags` member.