Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Apr 12, 2009

  1. David Aguilar

    mergetool--lib: simplify API usage by removing more global variables

    The mergetool--lib scriplet was tricky to use because it relied upon
    the existance of several global shell variables.  This removes more
    global variables so that things are simpler for callers.
    
    A side effect is that some variables are recomputed each time
    run_merge_tool() is called, but the overhead for recomputing
    them is justified by the simpler implementation.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed

Apr 08, 2009

  1. David Aguilar

    difftool/mergetool: refactor commands to use git-mergetool--lib

    This consolidates the common functionality from git-mergetool and
    git-difftool--helper into a single git-mergetool--lib scriptlet.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed
  2. David Aguilar

    difftool: add support for a difftool.prompt config variable

    difftool now supports difftool.prompt so that users do not have to
    pass --no-prompt or hit enter each time a diff tool is launched.
    The --prompt flag overrides the configuration variable.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed
  3. David Aguilar

    difftool: move 'git-difftool' out of contrib

    This prepares 'git-difftool' and its documentation for
    mainstream use.
    
    'git-difftool-helper' became 'git-difftool--helper'
    since users should not use it directly.
    
    'git-difftool' was added to the list of commands as
    an ancillaryinterrogator.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed
Something went wrong with that request. Please try again.