Commit Graph

15838 Commits

Author SHA1 Message Date
Junio C Hamano
d59a6043a8 Merge with gitk.
This merges commit
    fa4da7b32e
from gitk into our head commit
    6b7242aa1a

Sincerely,
    jit-merge command.
2005-08-07 17:10:20 -07:00
Paul Mackerras
fa4da7b32e Better graph line details display and expand history coverage.
Now the history remembers when we have clicked on a graph line
and when we have asked for a diff between two commits, as well
as when we have displayed a commit.

The display when you click on a graph line now uses clickable
SHA1 IDs instead of the embedded "Go" buttons.  Also made the
IDs clickable in the header for a diff between two commits.
2005-08-08 09:47:22 +10:00
Linus Torvalds
8b19280930 [PATCH] gitk "parent information" in commit window
This adds a useful "Parent:" line to the git commit information window.

It looks something like this (from the infamous octopus merge):

	Author: Junio C Hamano <junkio@cox.net>  2005-05-05 16:16:54
	Committer: Junio C Hamano <junkio@cox.net>  2005-05-05 16:16:54
	Parent: fc54a9c30c  (Update git-apply-patch-script ...)
	Parent: 9e30dd7c0e  (Make git-prune-script executa ...)
	Parent: c4b83e618f  (Do not write out new index if ...)
	Parent: 660265909f  (diff-cache shows differences  ...)
	Parent: b28858bf65  (Update diff engine for symlin ...)

	    Octopus merge of the following five patches.

	      Update git-apply-patch-script for symbolic links.
	      Make git-prune-script executable again.
	      Do not write out new index if nothing has changed.
	      diff-cache shows differences for unmerged paths without --cache.
	      Update diff engine for symlinks stored in the cache.

	    Signed-off-by: Junio C Hamano <junkio@cox.net>

where all the parent commit ID's are clickable, because the new lines are
added as part of the "comment" string, and thus the regular clickability
thing will match them automatically.

I think this is good. And my random-tcl-monkey-skills are clearly getting
better (although it's perfectly possible that somebody who actually knows
what he is doing would have done things differently).

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-08-08 08:40:24 +10:00
Kay Sievers
e4669df9a6 Make the tag view look like commit header. 2005-08-08 00:02:39 +02:00
Junio C Hamano
1ff53bfdee Merge with master.
This merges commit
    6b7242aa1a
from master into our head commit
    f29eaed12f

Sincerely,
    jit-merge command.
2005-08-07 14:12:38 -07:00
Junio C Hamano
6b7242aa1a Merge with gitk.
This merges commit
    d6e8149bc5
from gitk into our head commit
    200e7fbbac

Sincerely,
    jit-merge command.
2005-08-07 14:11:08 -07:00
Junio C Hamano
200e7fbbac (revert local fix)
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-07 14:11:02 -07:00
Kay Sievers
f5dfb3f6a6 add README
Two files are better than one. :)
2005-08-07 22:39:58 +02:00
Kay Sievers
d263a6bd45 v236 2005-08-07 20:29:03 +02:00
Kay Sievers
d8a20ba9bc v235 2005-08-07 20:28:53 +02:00
Kay Sievers
f49201a995 v234 2005-08-07 20:28:42 +02:00
Kay Sievers
f6375b2452 v233 2005-08-07 20:28:33 +02:00
Kay Sievers
1b1cd42182 v232 2005-08-07 20:28:01 +02:00
Kay Sievers
d05c19eeb2 v229 2005-08-07 20:27:49 +02:00
Kay Sievers
4fac5294de v227 2005-08-07 20:27:38 +02:00
Kay Sievers
71be1e7948 v225 2005-08-07 20:27:27 +02:00
Kay Sievers
c994d620cc v220 2005-08-07 20:27:18 +02:00
Kay Sievers
ea4a6df408 v206 2005-08-07 20:26:49 +02:00
Kay Sievers
dcea8d0b84 v205 2005-08-07 20:26:38 +02:00
Kay Sievers
198066916a v203 2005-08-07 20:26:27 +02:00
Kay Sievers
1f22c26777 v165 2005-08-07 20:26:12 +02:00
Kay Sievers
2bf7a52c61 v164 2005-08-07 20:26:03 +02:00
Kay Sievers
7ab0d2b646 v163 2005-08-07 20:25:54 +02:00
Kay Sievers
bddec01de1 v160 2005-08-07 20:25:42 +02:00
Kay Sievers
10dba28d74 v157 2005-08-07 20:25:27 +02:00
Kay Sievers
a4d26ef062 v154 2005-08-07 20:24:51 +02:00
Kay Sievers
fa378499c7 v152 2005-08-07 20:24:43 +02:00
Kay Sievers
0db37973ed v150 2005-08-07 20:24:35 +02:00
Kay Sievers
440c60068b v149 2005-08-07 20:24:01 +02:00
Kay Sievers
7403d50bd2 v148 2005-08-07 20:23:49 +02:00
Kay Sievers
e925f38c2d v145 2005-08-07 20:23:35 +02:00
Kay Sievers
9ea82aa8e0 v143 2005-08-07 20:23:24 +02:00
Kay Sievers
ede5e1009e v142 2005-08-07 20:23:12 +02:00
Kay Sievers
8ab1da2c4f v136 2005-08-07 20:22:53 +02:00
Kay Sievers
c07ad4b971 v133 2005-08-07 20:22:44 +02:00
Kay Sievers
42f7eb94a0 v125 2005-08-07 20:21:46 +02:00
Kay Sievers
eb28240b64 v121 2005-08-07 20:21:34 +02:00
Kay Sievers
09bd789841 v118 2005-08-07 20:21:23 +02:00
Kay Sievers
b87d78d60c v107 2005-08-07 20:21:04 +02:00
Kay Sievers
2735983d79 v089 2005-08-07 20:20:20 +02:00
Kay Sievers
034df39ef7 v088 2005-08-07 20:20:07 +02:00
Kay Sievers
6191f8e1dd v085 2005-08-07 20:19:56 +02:00
Kay Sievers
2bb7c6d417 v082 2005-08-07 20:19:45 +02:00
Kay Sievers
927dcec480 v080 2005-08-07 20:18:44 +02:00
Kay Sievers
334538f11d v078 2005-08-07 20:18:30 +02:00
Kay Sievers
d63577da05 v077 2005-08-07 20:18:13 +02:00
Kay Sievers
1207151d40 v073 2005-08-07 20:18:01 +02:00
Kay Sievers
820e4f6b6b v071 2005-08-07 20:17:50 +02:00
Kay Sievers
9cd3d98873 v070 2005-08-07 20:17:42 +02:00
Kay Sievers
664f4cc5eb v064 2005-08-07 20:17:19 +02:00