diff options
| author | David Engster | 2014-11-27 23:17:40 +0100 |
|---|---|---|
| committer | David Engster | 2014-11-27 23:23:48 +0100 |
| commit | 692322388c9f5bdebf2e8c4f7434c1d4769a04cc (patch) | |
| tree | 88c162f390829266271e79d9b3f54e94856e50f9 /admin/ChangeLog | |
| parent | d931478266f7ec1216c927caf926f8be8cec4094 (diff) | |
| download | emacs-692322388c9f5bdebf2e8c4f7434c1d4769a04cc.tar.gz emacs-692322388c9f5bdebf2e8c4f7434c1d4769a04cc.zip | |
admin: Add documentation for gitmerge.el
* gitmerge.el: New file.
* notes/git-workflow: Add documentation for using it.
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index c30e4bea5b6..84aea47ae9e 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2014-11-27 David Engster <deng@randomsample.de> | 1 | 2014-11-27 David Engster <deng@randomsample.de> |
| 2 | 2 | ||
| 3 | * gitmerge.el: New file. | 3 | * gitmerge.el: New file. |
| 4 | * notes/git-workflow: Add documentation for using it. | ||
| 4 | 5 | ||
| 5 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> | 6 | 2014-11-17 Oscar Fuentes <ofv@wanadoo.es> |
| 6 | 7 | ||