danpreston / gittools fork watch download tarball
public
Fork of farktronix/gittools
Description: Collection of scripts for performing generic git tasks
Clone URL: git://github.com/danpreston/gittools.git 
Added an error message if there are no modified files when using the -m 
option.
danpreston (author)
Mon May 12 02:38:14 -0700 2008
commit  6d0ac06fcbd802402504c4c4ca1a050e23c9a8d3
tree    14dc3518d8021b1f853fa0ec88444d2a8576ec21
parent  1f5ebd858a12e080f4c7a137444fedc0767a9c63
gittools / git-diff-master
100755 18 lines (15 sloc) 0.404 kb
raw blame history 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18

#!/bin/bash
 
# git-diff-master
# Jacob Farkas <jacobf@rkas.net>
# Opens filemerge with a diff of the current working copy versus the master branch
 
mktemp=`which mktemp`
if [ -z $mktemp ]; then
    tmpdir="/tmp/master" 
else
    tmpdir=`$mktemp /tmp/masterXXXXX`
fi
rm -rf $tmpdir
mkdir -p $tmpdir 
git-archive --format=tar master | (tar xf - -C $tmpdir)
opendiff $tmpdir . -merge . | cat
rm -rf $tmpdir