Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Aug 19, 2011

  1. David Aguilar

    difftool--helper: Make style consistent with git

    Use the predominant conditional style where "then" appears
    alone on the line after the test expression.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed

Dec 16, 2010

  1. Michael J Gruber

    difftool: provide basename to external tools

    Currently, only configured diff helpers get the basename of the file
    being compared. Tools specified with "git difftool -x" only get the
    names of temporary files for the different versions.
    
    Export BASE so that an external tool can read the name from the
    environment. Rather than using a third argument, this avoids breaking
    existing scripts which may somewhat carelessly be using "$@" rather than
    "$1" "$2".
    
    Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    mjg authored gitster committed

Jan 22, 2010

  1. Sebastian Schuberth

    Make difftool.prompt fall back to mergetool.prompt

    The documentation states that "git-difftool falls back to git-mergetool
    config variables when the difftool equivalents have not been defined".
    Until now, this was not the case for "difftool.prompt".
    
    Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
    Acked-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    sschuberth authored gitster committed

Jan 16, 2010

  1. David Aguilar

    difftool: Update copyright notices to list each year separately

    This is http://www.gnu.org/licenses/gpl-howto.html advises.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed

Jan 15, 2010

  1. David Aguilar

    difftool: Use eval to expand '--extcmd' expressions

    It was not possible to pass quoted commands to '--extcmd'.
    By using 'eval' we ensure that expressions with spaces and
    quotes are supported.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed

Jan 10, 2010

  1. David Aguilar

    difftool: Allow specifying unconfigured commands with --extcmd

    git-difftool requires difftool.<tool>.cmd configuration even when
    tools use the standard "$diffcmd $from $to" form.  This teaches
    git-difftool to run these tools in lieu of configuration by
    allowing the command to be specified on the command line.
    
    Reference: http://article.gmane.org/gmane.comp.version-control.git/133377
    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--helper: Remove use of the GIT_MERGE_TOOL variable

    An undocumented mis-feature in git-difftool is that it allows you
    to specify a default difftool by setting GIT_MERGE_TOOL.
    This behavior was never documented and was included as an
    oversight back when git-difftool was maintained outside of git.
    
    git-mergetool never honored GIT_MERGE_TOOL so neither should
    git-difftool.
    
    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--helper: Update copyright and remove distracting comments

    Some of the comments in git-difftool--helper are not needed because
    the code is sufficiently readable without them.
    
    Signed-off-by: David Aguilar <davvid@gmail.com>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>
    davvid authored gitster committed

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.