diff --git a/var/spack/repos/builtin/packages/git-imerge/package.py b/var/spack/repos/builtin/packages/git-imerge/package.py
new file mode 100644
index 0000000000..21ca1ec817
--- /dev/null
+++ b/var/spack/repos/builtin/packages/git-imerge/package.py
@@ -0,0 +1,62 @@
+##############################################################################
+# Copyright (c) 2013-2017, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/spack/spack
+# Please also see the NOTICE and LICENSE files for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack import *
+
+
+class GitImerge(MakefilePackage):
+    """git-imerge: Incremental merge & rebase for git
+
+       Perform a merge between two branches incrementally. If
+       conflicts are encountered, figure out exactly which pairs of
+       commits conflict, and present the user with one pairwise
+       conflict at a time for resolution.
+
+       git-imerge has two primary design goals:
+
+       * Reduce the pain of resolving merge conflicts to its
+         unavoidable minimum, by finding and presenting the smallest
+         possible conflicts: those between the changes introduced by
+         one commit from each branch.
+
+       * Allow a merge to be saved, tested, interrupted, published,
+         and collaborated on while it is in progress."""
+
+    homepage = "https://github.com/mhagger/git-imerge"
+    url      = "https://github.com/mhagger/git-imerge/archive/v1.1.0.tar.gz"
+
+    version('1.1.0', '94a44dcbe5e764d75770a24517572a76')
+    version('1.0.0', 'e5e69a22610828cc33bf2cbd31685438')
+
+    depends_on('python@2.6:')
+    depends_on('py-argparse', when='^python@2.6')
+    depends_on('git')
+
+    # Package copies a Python script and bash-completion files, so
+    # there's no need to "build" anything.
+    def build(self, spec, prefix):
+        pass
+
+    def install(self, spec, prefix):
+        make('DESTDIR={0}'.format(prefix), 'PREFIX=', 'install')