]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
* 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

1  2 
gitk-git/gitk

diff --cc gitk-git/gitk
Simple merge