Add Changelog note and added Emre to list of contributors.

0d00b698 · Vincent Driessen · 62c339eb · 0d00b698 · 0d00b698
Commit 0d00b698 authored Nov 28, 2011 by Vincent Driessen
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

AUTHORS AUTHORS +1 -0

Changes.mdown Changes.mdown +3 -0

No files found.
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,5 +16,6 @@ Authors are (ordered by first commit date):
 - Kiall Mac Innes
 - Jon Bernard
 - Olivier Mengué
+- Emre Berge Ergenekon

 Portions derived from other open source works are clearly marked.
--- a/Changes.mdown
+++ b/Changes.mdown
@@ -2,6 +2,9 @@
 -----
 Release date: **not yet**

+* `git flow init` now detects situations where origin already has gitflow
+  branches set up, and behaves accordingly (thanks Emre Berge Ergenekon)
+
 * `git flow feature finish` can now be called without a feature branch
  name(prefix) argument and will finish the current branch, if on any.