?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: aa576e6 1ce09dd)
Merge git://git2.kernel.org/pub/scm/gitk/gitk
commit00cec846f157b5363b0967d1e4cba76b44d48e77
authorJunio C Hamano <junkio@cox.net>
Thu, 22 Mar 2007 10:05:34 +0000 (22 03:05 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 22 Mar 2007 10:05:34 +0000 (22 03:05 -0700)
tree6b0310d00c32fab34c6ab98abb6d9319338375f5tree | snapshot (tar.gz zip)
parentaa576e6b47d8e20d0d56d0e9f9fc2ecce5bae1e1commit | diff
parent1ce09dd6787c495986c75b37b07ba6bbf19b47dacommit | diff
Merge git://git2.kernel.org/pub/scm/gitk/gitk

* git://git2.kernel.org/pub/scm/gitk/gitk:
  [PATCH] prefer "git COMMAND" over "git-COMMAND" in gitk
Miklos' Git tree to make git-merge a builtin.