path: root/epoch.c
diff options
authorLinus Torvalds <>2005-06-22 21:05:02 (GMT)
committerLinus Torvalds <>2005-06-22 21:05:02 (GMT)
commit5569bf9bbedd63a00780fc5c110e0cfab3aa97b9 (patch)
treea986200ee3b8b75f20e6734267019787fbf6ed5c /epoch.c
parentfae22ac9d7b5fd8bbf0fcfb01aab01c27d84912f (diff)
parent6c20ff3423e39f9982436953b6b9103f3f8447f8 (diff)
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.
Diffstat (limited to 'epoch.c')
0 files changed, 0 insertions, 0 deletions