projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f7c9a7 2fe167b)
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Sat, 22 Sep 2007 02:03:27 +0000 (22:03 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Sat, 22 Sep 2007 02:03:27 +0000 (22:03 -0400)
* maint:
  git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
  git-gui: Handle starting on mapped shares under Cygwin
  git-gui: Display message box when we cannot find git in $PATH

Conflicts:

git-gui.sh

1  2 
git-gui.sh patch | diff1 | diff2 | blob | history

diff --cc git-gui.sh
Simple merge
Git—the stupid content tracker