Merge branch 'ah/doc-gitk-config'
commitb2273d06033e5989ca30a72492ca894d0416354f
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Mar 2014 20:51:08 +0000 (28 13:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Mar 2014 20:51:09 +0000 (28 13:51 -0700)
treea6a79dabf83fc2081b3d10ed3fd1ca9fab409fdb
parentc301a23ff8701ae2a50c62c00c400f87e6585511
parent36dc827bc9d17f80ed4f326de21247a5d1341fbc
Merge branch 'ah/doc-gitk-config'

* ah/doc-gitk-config:
  Documentation/gitk: document the location of the configulation file