Permalink
Browse files

Do a cross-project merge of Paul Mackerras' gitk visualizer

gitk is really quite incredibly cool, and is great for visualizing what
is going on in a git repository.  It's especially useful when you are
looking at what has changed since a particular version, since it
gracefully handles partial trees (and this also avoids the expense of
looking at _all_ changes in a big project).

For example, to see what changed in a merge after a "git pull", do

	gitk ORIG_HEAD..

to see only the new things.  Or you can simply do "gitk v2.6.12.." to
see what has changed since the v2.6.12 tag etc.

This merge itself is pretty interesting too, since it shows off a
feature of git itself that is incredibly cool: you can merge a
_separate_ git project into another git project.  Not only does this
keep all the history of the original project, it also makes it possible
to continue to merge with the original project and the union of the two
projects.

I don't think anybody else can do that.
  • Loading branch information...
Linus Torvalds
Linus Torvalds committed Jun 22, 2005
2 parents fae22ac + 6c20ff3 commit 5569bf9bbedd63a00780fc5c110e0cfab3aa97b9
Showing with 1,711 additions and 0 deletions.
  1. +1,711 −0 gitk
Oops, something went wrong.

0 comments on commit 5569bf9

Please sign in to comment.