diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-12-09 14:55:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-12-09 14:55:41 -0800 |
| commit | ec418bcfd0196a1d02827a703faeb846c89592d3 (patch) | |
| tree | 53f83d19c4914cbcecd961ee6e642c57117fba4f /builtin/merge-recursive.c | |
| parent | Start 1.9 cycle (diff) | |
| parent | gitk: Recognize -L option (diff) | |
| download | tgif-ec418bcfd0196a1d02827a703faeb846c89592d3.tar.xz | |
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
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions