summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorIsmael Luceno2014-12-09 22:58:56 -0300
committerIsmael Luceno2014-12-09 23:02:48 -0300
commit3a2caf4429cd68c96b9102ba9b565e538e65a35b (patch)
tree5efb18131a8ec1fe408fbc0af629558ff89eb8f5 /ChangeLog
parentd7d8c10b44eda95f822fea6e81341e5ac318d7e4 (diff)
git-imerge: new spell, Incremental merge and rebase for git
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 66b5ecde24..8ac8fc1851 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
2014-12-09 Ismael Luceno <ismael@sourcemage.org>
* devel/cvs-fast-export: new spell, Export an RCS or CVS history as
a fast-import stream
+ * devel/git-imerge: new spell, Incremental merge and rebase for
+ git
2014-12-07 Ismael Luceno <ismael@sourcemage.org>
* devel/reposurgeon: new spell, A tool for editing version-control