Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
branch: master
Commits on Nov 20, 2014
  1. Merge pull request #24 from Roberto5/master

    authored
    changes the command git alias, add the path into '
Commits on Jun 30, 2013
  1. Merge pull request #26 from wmanley/travis

    authored
    Add support for Travis CI
    
    Travis CI[1] is a continuous integration service for open-source
    projects.  This commit adds support for it so tests will be run for
    each pull-request.
    
    [1]: https://travis-ci.org/
  2. Add support for Travis CI

    authored
    Travis CI[1] is a continuous integration service for open-source
    projects.  This commit adds support for it so tests will be run for
    each pull-request.
    
    [1]: https://travis-ci.org/
  3. test.sh: Fix tests when git user.name/user.email is not setup

    authored
    On Travis CI `git` `user.name` and `user.email` is not set in the
    `git` config.  This was causing `git commit` to fail during test setup.
    This commit fixes this issue by always explicitly setting `user.name`
    and `user.email` in the test repo.
  4. test.sh: Verbose mode prints setup/teardown output

    authored
    When test.sh is given flag -v (verbose) the output from setup and
    teardown will now be printed.  This was useful to debug adding support
    for Travis CI - a continuous integration system.
Commits on Apr 16, 2013
  1. Add note that git-meld is obsolete

    authored
    git difftool learnt the --dir-diff option in git 1.7.11 which behaves
    just the same as git meld but is built in to git.
Commits on Mar 17, 2013
  1. @Roberto5
Commits on Sep 25, 2012
  1. Merge pull request #18 from pacoqueen/master

    authored
    If parent directory name contains blank spaces, git rev-parse --show-toplevel 
    fails. Escaping command before "cd" to it solves the problem.
Commits on Sep 24, 2012
  1. Regression test for spaces in dirname issue.

    Francisco José Rodríguez Bogado authored
  2. Escape spaces in dirnames.

    Francisco José Rodríguez Bogado authored
Commits on Jan 22, 2012
  1. Fix issue #4 - "git meld master... fails"

    authored
        git meld master...
    
    fails with a merge-base error.  This patch makes it should be equivalent
    to:
    
        git meld $(git merge-base master HEAD) HEAD
    
    This is consistent with the behaviour of git diff
Commits on Nov 13, 2011
  1. Add some automated tests

    authored
    This should make further maintenance much easier.
Commits on Nov 1, 2011
  1. cd to toplevel before archiving files so paths actually work

    Peter Arrenbrecht authored
Commits on May 25, 2011
  1. Fix bug: mktemp fails on MacOS

    authored
    Unlike GNU userland, MacOS "mktemp" requires a template to be
    given with the -t command line option.  This patch adds this option so
    MacOS should be better supported.
    
    Thanks goes to David Hersey for reporting this bug.
Commits on Apr 22, 2011
  1. Fix bug: Error when comparing with remote branches

    authored
    git-meld didn't deal with commit names with slashes in them, such as
    "origin/master".  This patch fixes that issue.
    
    The bug report and this patch were contributed by Adam Dingle.
Commits on Nov 28, 2010
  1. Add contact information.

    authored
  2. Add GPLv2+ Licence

    authored
Commits on Nov 27, 2010
  1. Add documentation

    authored
Commits on Nov 25, 2010
  1. Handle being given no commits like git diff does

    authored
    Invokes meld's built-in git comparison between HEAD and the working copy
  2. Fix merge-base comparison.

    authored
    git meld A...B was broken because the whitespace was not being trimmed
    from the output of git merge-base.
Commits on Nov 24, 2010
  1. Initial Revision

    authored
Something went wrong with that request. Please try again.