git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0b2bc46 906ab7f)
Merge branch 'maint'
authorShawn O. Pearce <redacted>
Wed, 3 Oct 2007 04:17:19 +0000 (00:17 -0400)
committerShawn O. Pearce <redacted>
Wed, 3 Oct 2007 04:17:19 +0000 (00:17 -0400)
commite73bfa7709b108575e6ea73d6e97fc3efd967b38
tree507b318fe2f1b74595541ee561c8976906d59b66tree | snapshot
parent0b2bc460fc69d2aa4f5af743b2b2317088e53949commit | diff
parent906ab7f6c03764423adef6c0e4d77442405adc23commit | diff
Merge branch 'maint'

* maint:
  git-gui: Don't crash when starting gitk from a browser session
  git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk

Conflicts:

git-gui.sh
git-gui.sh diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT