2 files changed, 29 insertions, 0 deletions
diff --git a/Library/Formula/git-flow-avh.rb b/Library/Formula/git-flow-avh.rb
new file mode 100644
index 000000000..49e50c660
--- /dev/null
+++ b/Library/Formula/git-flow-avh.rb
@@ -0,0 +1,27 @@
+require 'formula'
+
+class GitFlowAvh < Formula
+  homepage 'https://github.com/petervanderdoes/gitflow'
+  url 'https://github.com/petervanderdoes/gitflow/archive/1.4.2.tar.gz'
+  sha1 '8ea7ac31e062ff01de6203d30de9fc049891589e'
+
+  head 'https://github.com/petervanderdoes/gitflow.git', :branch => 'develop'
+
+  depends_on 'gnu-getopt'
+
+  conflicts_with 'git-flow'
+
+  def install
+    system "make", "prefix=#{prefix}", "install"
+  end
+
+  def caveats; <<-EOS.undent
+    Create a ~/.gitflow_export file with the content
+      alias getopt="$(brew --prefix gnu-getopt)/bin/getopt"
+     EOS
+  end
+
+  def test
+    system "#{bin}/git-flow version"
+  end
+end
diff --git a/Library/Formula/git-flow.rb b/Library/Formula/git-flow.rb
index 2be090a4a..31cd46bd0 100644
--- a/Library/Formula/git-flow.rb
+++ b/Library/Formula/git-flow.rb
@@ -17,6 +17,8 @@ class GitFlow < Formula
 
   head 'https://github.com/nvie/gitflow.git', :branch => 'develop'
 
+  conflicts_with 'git-flow-avh'
+
   def install
     system "make", "prefix=#{prefix}", "install"