From: Junio C Hamano Date: Mon, 9 Dec 2013 22:55:41 +0000 (-0800) Subject: Merge git://ozlabs.org/~paulus/gitk X-Git-Tag: v1.9-rc0~81 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec418bcfd0196a1d02827a703faeb846c89592d3;p=thirdparty%2Fgit.git Merge git://ozlabs.org/~paulus/gitk * git://ozlabs.org/~paulus/gitk: gitk: Recognize -L option gitk: Support showing the gathered inline diffs gitk: Split out diff part in $commitinfo gitk: Refactor per-line part of getblobdiffline and its support gitk: Support -G option from the command line gitk: Tag display improvements --- ec418bcfd0196a1d02827a703faeb846c89592d3