Merge git://ozlabs.org/~paulus/gitk
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Dec 2013 22:55:41 +0000 (14:55 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Dec 2013 22:55:41 +0000 (14:55 -0800)
commitec418bcfd0196a1d02827a703faeb846c89592d3
tree53f83d19c4914cbcecd961ee6e642c57117fba4f
parent077f43447c4931dd2e7890f16e8728f7f7376b87
parentce2c58cdaad42b9af6ad243f149c542ea93f8d01
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
gitk-git/gitk