Skip to content

Instantly share code, notes, and snippets.

@miner

miner/gdiff

Last active December 11, 2024 22:46
Show Gist options
  • Save miner/e73fc98a83a8fe05d9ef000d46d68a9f to your computer and use it in GitHub Desktop.
Save miner/e73fc98a83a8fe05d9ef000d46d68a9f to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. miner revised this gist Apr 25, 2016. 1 changed file with 3 additions and 3 deletions.
    6 changes: 3 additions & 3 deletions gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -9,10 +9,10 @@
    dir=$PWD
    until [ -e "$dir/.git" ]; do
    if [ "$dir" == "/" ]; then
    break;
    else
    dir=`dirname "$dir"`
    echo "Not a git repository" >&2
    exit 1;
    fi
    dir=`dirname "$dir"`
    done

    # open fresh FileMerge and wait for termination, avoids issues with git temp files
  2. miner revised this gist Apr 24, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -8,7 +8,7 @@
    # find top level of git project
    dir=$PWD
    until [ -e "$dir/.git" ]; do
    if [ $dir == "/" ]; then
    if [ "$dir" == "/" ]; then
    break;
    else
    dir=`dirname "$dir"`
  3. miner revised this gist Apr 24, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -11,7 +11,7 @@ until [ -e "$dir/.git" ]; do
    if [ $dir == "/" ]; then
    break;
    else
    dir=`dirname "$dir"`
    dir=`dirname "$dir"`
    fi
    done

  4. miner revised this gist Apr 24, 2016. 1 changed file with 7 additions and 7 deletions.
    14 changes: 7 additions & 7 deletions gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -5,14 +5,14 @@
    # cd to your project dir and and run difftool like this:
    # git difftool -d -x gdiff

    # cd to top level of git project
    # find top level of git project
    dir=$PWD
    until [ $dir == "/" ]; do
    if [ -e "$dir/.git" ]; then
    break;
    else
    dir=`dirname "$dir"`
    fi
    until [ -e "$dir/.git" ]; do
    if [ $dir == "/" ]; then
    break;
    else
    dir=`dirname "$dir"`
    fi
    done

    # open fresh FileMerge and wait for termination, avoids issues with git temp files
  5. miner revised this gist Apr 23, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -11,7 +11,7 @@ until [ $dir == "/" ]; do
    if [ -e "$dir/.git" ]; then
    break;
    else
    dir=`dirname "$dir"`
    dir=`dirname "$dir"`
    fi
    done

  6. miner revised this gist Apr 23, 2016. 1 changed file with 1 addition and 4 deletions.
    5 changes: 1 addition & 4 deletions gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -2,11 +2,8 @@
    # my git difftool, calls FileMerge with project as -merge target
    # better than using opendiff
    #
    # configuration (once):
    # git config --global difftool.gdiff.cmd "gdiff \$LOCAL \$REMOTE"
    #
    # cd to your project dir and and run difftool like this:
    # git difftool -d -t gdiff
    # git difftool -d -x gdiff

    # cd to top level of git project
    dir=$PWD
  7. miner created this gist Apr 23, 2016.
    26 changes: 26 additions & 0 deletions gdiff
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,26 @@
    #!/bin/bash
    # my git difftool, calls FileMerge with project as -merge target
    # better than using opendiff
    #
    # configuration (once):
    # git config --global difftool.gdiff.cmd "gdiff \$LOCAL \$REMOTE"
    #
    # cd to your project dir and and run difftool like this:
    # git difftool -d -t gdiff

    # cd to top level of git project
    dir=$PWD
    until [ $dir == "/" ]; do
    if [ -e "$dir/.git" ]; then
    break;
    else
    dir=`dirname "$dir"`
    fi
    done

    # open fresh FileMerge and wait for termination, avoids issues with git temp files
    open -a FileMerge -n -W --args -left "$1" -right "$2" -merge "$dir"

    # references:
    # http://hints.macworld.com/article.php?story=20070220223441729
    # https://gist.github.com/bkeating/329690