From 309d0f0c8b6664241d3bf5692f4463333f2c85e6 Mon Sep 17 00:00:00 2001
From: Spencer Whitt <sw@swhitt.me>
Date: Tue, 7 Apr 2015 00:38:20 -0400
Subject: [PATCH] git-imerge: new package

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-imerge/default.nix      | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-imerge/default.nix

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index b206fc671b5a..f492ae61d0ca 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -102,4 +102,6 @@ rec {
   git-extras = callPackage ./git-extras { };
 
   git-cola = callPackage ./git-cola { };
+
+  git-imerge = callPackage ./git-imerge { };
 }
diff --git a/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
new file mode 100644
index 000000000000..de3041806859
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-imerge/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "git-imerge-${version}";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    repo = "git-imerge";
+    owner = "mhagger";
+    rev = version;
+    sha256 = "09czjxgjbby54jx1v5m825k87v8g9g374hwv0r6ss48kv1ipvakq";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make install PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mhagger/git-imerge;
+    description = "Perform a merge between two branches incrementally";
+    license = licenses.gpl2;
+    platforms = platforms.all;
+    maintainers = [ maintainers.spwhitt ];
+  };
+}