Gentoo Logo
Gentoo Spaceship

Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-scm
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
To: gentoo-scm@g.o
From: Caleb Cushing <xenoterracide@...>
Subject: git mergetool patch (for skipping and aborting)
Date: Sun, 12 Apr 2009 13:03:09 -0400
I thought I'd share this with the gentoo-scm list just in case someone
is interested. It was rejected by the git list due to mergetool
needing refactoring. basically I have to clean up temporary files I
shouldn't have to clean up and that was going to require me to
refactor more of mergetool than I understood. I created the patch to
skip merging manifests or abort out when there were nothing left but
manifests to merge. but it'll work for anything. the patch doesn't
break any current functionality. (this version only works for 1.6.2*)

Caleb Cushing
20090304-git-1.6.2-mergetool-merge-skip-abort-at-prompt.patch (Binary data)
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Splitting gentoo-x86 repository for easier consumption
Next by thread:
'overlays' are altenatives to full tree clone
Previous by date:
Re: Status report, 2009/04/10
Next by date:
'overlays' are altenatives to full tree clone

Updated Jun 17, 2009

Summary: Archive of the gentoo-scm mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.