Path: csiph.com!aioe.org!bofh.it!news.nic.it!robomod From: James Clarke Newsgroups: linux.debian.bugs.dist,linux.debian.devel,linux.debian.maint.python Subject: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git Date: Tue, 20 Nov 2018 20:40:01 +0100 Message-ID: X-Original-To: Debian Bug Tracking System X-Mailbox-Line: From debian-bugs-dist-request@lists.debian.org Tue Nov 20 19:39:10 2018 Old-Return-Path: X-Spam-Flag: NO X-Spam-Score: -4.2 Reply-To: James Clarke , 914230@bugs.debian.org Resent-To: debian-bugs-dist@lists.debian.org Resent-Cc: debian-devel@lists.debian.org, debian-python@lists.debian.org, wnpp@debian.org X-Debian-Pr-Message: report 914230 X-Debian-Pr-Package: wnpp X-Spam-Bayes: score:0.0000 Tokens: new, 23; hammy, 150; neutral, 36; spammy, 0. spammytokens: hammytokens:0.000-+--HX-Debbugs-Cc:sk:debian-, 0.000-+--H*M:reportbug, 0.000-+--H*MI:reportbug, 0.000-+--H*x:reportbug, 0.000-+--H*UA:reportbug X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:content-transfer-encoding:from:to :subject:message-id:date; bh=2vKIP46hqkezSjsLtUKoFVnMPP6NQ7spYYpdRZkBNZc=; b=EwLW9jPcJfU+Xs7df+uGDBJvGD0ke6WHWDiJb32Ba55xBvn7bcEEK6qodXDPa/luFv 27BpUAWTbSD1kEKQjDCD0WiSTLJlnT/dgYDCLZmtUEe+g+qKYk47G7P0uPKZo0nlyNfT a0ZVDT5r+haTtH23EAa9wWP7WqFKdBKy8Lrd760aedaCBvk8OeEOmpXNHEwYO13/WaG+ OqY6D6EzjhQXnc85lVqLNmoJcAekZDtgKAhW7u+WAivZUfSm/tiNLn6tSad7n4KlmSk6 XhIM5ZNc9uoxD7z32vHLYV/Qx6/AgG0rXgV9UpdneWTSeMwGW95vwHCG3rA8NkxKGmlG MrDQ== X-Gm-Message-State: AGRZ1gIqZem/YNwEbCrpq/Jfq/Ab/lX0Pz+4QDoAWSQqVr/T50ysfPar T5RRMX/j7d5+9uSun/SOD1annhM9V34= X-Google-SMTP-Source: AJdET5e5fOAz+kLcDX1SZfl01p5ZGe07FM5oFjQV0tXSa2cnXmt/+hg1gAT4aj6wdgTGsN/suOdFbA== X-Received: by 2002:a1c:9a46:: with SMTP id c67mr3144046wme.21.1542742670773; Tue, 20 Nov 2018 11:37:50 -0800 (PST) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Mailer: reportbug 7.5.0 X-Debian-Message: from BTS X-Mailing-List: archive/latest/1499850 List-ID: List-URL: Approved: robomod@news.nic.it Lines: 23 Organization: linux.* mail to news gateway Sender: robomod@news.nic.it X-Original-Date: Tue, 20 Nov 2018 19:37:49 +0000 X-Original-Message-ID: <154274266937.23637.6522668788329141691.reportbug@debian> Xref: csiph.com linux.debian.bugs.dist:929030 linux.debian.devel:88922 linux.debian.maint.python:11106 Package: wnpp Severity: wishlist Owner: James Clarke * Package name : git-imerge Version : 1.1.0 Upstream Author : Michael Haggerty * URL : https://github.com/mhagger/git-imerge * License : GPLv2+ Programming Lang: Python Description : incremental merge and rebase for git Performs a merge between two branches incrementally. If conflicts are encountered, figures out exactly which pairs of commits conflict, and presents the user with one pairwise conflict at a time for resolution. I recently discovered this useful tool and now use it for my day-to-day work dealing with forks of large upstream projects. I intend to maintain this as part of PAPT (which I've just found out is open to all DDs, though out of courtesy I've still Cc'ed debian-python). Regards, James