projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ebcffb1 f049e09)
Merge git://repo.or.cz/git-gui
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2008 07:08:02 +0000 (00:08 -0700)
commit547905f8cd2a04b3e1117f00025b60f81aa60f47
tree9e9421e597a9caecc6f16c3afd6a1b77abacabb9tree | snapshot
parentebcffb1d44643bab69671abdf79209489e64dbefcommit | diff
parentf049e0944d32715ee8893d290d1c52888216fbe4commit | diff
Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: MERGE_RR lives in .git/ directly with newer Git versions
  git-gui: Exit shortcut in MacOSX repaired
git-gui/git-gui.sh diff1 | diff2 | blob | history
git-gui/lib/merge.tcl diff1 | diff2 | blob | history
Git—the stupid content tracker