diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-23 08:35:03 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-23 08:35:03 -0800 |
| commit | ec3ae6ec46ed48383ae40643990f169b65a563cc (patch) | |
| tree | 859ec1b3000b0eb3f8aac443327d9c3b4c90fa6f /git-mergetool--lib.sh | |
| parent | Merge branch 'jc/merge-blobs' (diff) | |
| parent | gitk: Display important heads even when there are many (diff) | |
| download | tgif-ec3ae6ec46ed48383ae40643990f169b65a563cc.tar.xz | |
Merge git://ozlabs.org/~paulus/gitk
* git://ozlabs.org/~paulus/gitk:
gitk: Display important heads even when there are many
gitk: Improve display of list of nearby tags and heads
gitk: Fix display of branch names on some commits
gitk: Update Swedish translation (296t)
gitk: When searching, only highlight files when in Patch mode
gitk: Fix error message when clicking on a connecting line
gitk: Fix crash when not using themed widgets
gitk: Use bindshiftfunctionkey to bind Shift-F5
gitk: Refactor code for binding modified function keys
gitk: Work around empty back and forward images when buttons are disabled
gitk: Highlight first search result immediately on incremental search
gitk: Highlight current search hit in orange
gitk: Synchronize highlighting in file view when scrolling diff
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions