diff options
Diffstat (limited to 'devel/git-imerge/DETAILS')
| -rwxr-xr-x | devel/git-imerge/DETAILS | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/devel/git-imerge/DETAILS b/devel/git-imerge/DETAILS new file mode 100755 index 0000000000..a84163c6a1 --- /dev/null +++ b/devel/git-imerge/DETAILS @@ -0,0 +1,25 @@ +. "$GRIMOIRE/FUNCTIONS" + SPELL=git-imerge + VERSION=$(get_scm_version) + SOURCE="$SPELL-git.tar.bz2" + SOURCE_URL[0]="git://github.com/mhagger/$SPELL.git" + SOURCE_IGNORE=volatile + SOURCE_DOWNLOAD=on +SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git" + WEB_SITE="http://github.com/mhagger/git-imerge" + LICENSE[0]="GPLv2+" + ENTERED=20141209 + KEYWORDS="" + SHORT="Incremental merge and rebase for git" +cat << EOF +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. +EOF |