Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 27 Jun 2007 04:36:38 +0000 (00:36 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Wed, 27 Jun 2007 04:36:38 +0000 (00:36 -0400)
* maint:
git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack
git-gui: Don't nice git blame on MSYS as nice is not supported
git-gui: Don't require $DISPLAY just to get --version

1  2 
Makefile patch | diff1 | diff2 | blob | history
git-gui.sh patch | diff1 | diff2 | blob | history
diff --cc Makefile
Simple merge
diff --cc git-gui.sh
Simple merge