git/gitk, branch v1.4.2Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v1.4.22006-08-13T01:32:17ZMerge git://git.kernel.org/pub/scm/gitk/gitk2006-08-13T01:32:17ZJunio C Hamanojunkio@cox.net2006-08-13T01:32:17Zurn:sha1:67e31d6234c0332334d7aedd70b2f101bc010cf9
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Show the currently checked-out head in bold font
gitk: Allow the user to set some colors
fixed variable declaration in gitk2006-08-03T20:21:07ZMichaelbarra_cuda@katamail.com2006-08-03T15:42:44Zurn:sha1:47781bf7793205cfb7b8ce89b9c3627ecf5480fc
Signed-off-by: Michael <barra_cuda@katamail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
gitk: Show the currently checked-out head in bold font2006-07-06T00:21:23ZPaul Mackerraspaulus@samba.org2006-07-06T00:21:23Zurn:sha1:8a48571ce52e5182ea32ed168e298882f8c470b3
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk: Allow the user to set some colors2006-07-05T12:56:37ZPaul Mackerraspaulus@samba.org2006-07-05T12:56:37Zurn:sha1:f8a2c0d14f5326e157b12ec549b864ddb492621d
This makes the colors for the diff old/new lines and hunk headers
configurable, as well as the background and foreground (text color)
of the various panes. There is now a GUI in the edit->preferences
window to set them.
Signed-off-by: Paul Mackerras <paulus@samba.org>
[PATCH] gitk: rereadrefs needs listrefs2006-06-11T23:37:44ZJunio C Hamanojunkio@cox.net2006-06-11T16:50:47Zurn:sha1:2e1ded44f709ddc95c5e8a87e0d98127979115fe
The listrefs procedure was inadvertently removed during the course of
development, but there is still a user of it, so resurrect it.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk: Re-read the descendent/ancestor tag & head info on update2006-06-06T23:19:45ZPaul Mackerraspaulus@samba.org2006-06-06T23:19:45Zurn:sha1:2d71bcccc81e3569d97dd1314c3ca0f080f4a70f
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk: Show branch name(s) as well, if "show nearby tags" is enabled2006-06-04T01:50:38ZPaul Mackerraspaulus@samba.org2006-06-04T01:50:38Zurn:sha1:ef030b8547eaeea1ef992310536b0b637e0c9431
This is a small extension to the code that reads the complete commit
graph, to make it compute descendent heads as well as descendent tags.
We don't exclude descendent heads that are descendents of other
descendent heads as we do for tags, since it is useful to know all the
branches that a commit is on.
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk: Show nearby tags2006-06-03T09:11:13ZPaul Mackerraspaulus@samba.org2006-06-03T09:11:13Zurn:sha1:b8ab2e177a7dacc37af933ec382ef9ea929127ee
This adds a feature to the diff display window where it will show
the tags that this commit follows (is a descendent of) and precedes
(is an ancestor of). Specifically, it will show the tags for all
tagged descendents that are not a descendent of another tagged
descendent of this commit, and the tags for all tagged ancestors
that are not ancestors of another tagged ancestor of this commit.
To do this, gitk reads the complete commit graph using git rev-list
and performs a couple of traversals of the tree. This is done in
the background, but since it can be time-consuming, there is an option
to turn it off in the `edit preferences' window.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Merge branch 'master' into new2006-05-30T11:35:07ZPaul Mackerraspaulus@samba.org2006-05-30T11:35:07Zurn:sha1:96535e615db869f096686b0ce8e79e30dec7ad25
Conflicts:
gitk
gitk: Add a goto next/previous highlighted commit function2006-05-30T11:33:07ZPaul Mackerraspaulus@samba.org2006-05-30T11:33:07Zurn:sha1:4e7d677949e8ee7617e42f10c1ddf5cd2adee3a1
This is invoked by shift-down/shift-up. It relies on a patch to
git-diff-tree that has recently gone into the git repository, commit
ID e0c97ca6 (without this it may just sit there doing waiting for
git-diff-tree when looking for the next/previous highlight).
Signed-off-by: Paul Mackerras <paulus@samba.org>