kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Linus Torvalds	6683463ed6	Do a very simple "merge-base" that finds the most recent common parent of two commits. The question of "best" commit can probably be tweaked almost arbitrarily. In particular, trying to take things like how big the tree differences are into account migt be a good idea. This one is just very simple.	20 years ago
Linus Torvalds	2fbdd13174	Remove "merge-tree.c" It's there in the history if somebody wants to resurrect it, but it seems to have been successfully superceded by the new and improved index-merge thing, where we do all merging entirely in the index.	20 years ago
Linus Torvalds	33deb63a36	Add "merge-tree" helper program. Maybe it's retarded, maybe it's helpful. It only works one directory level at a time, so lookout..	20 years ago
Junio C Hamano	42d545e8ff	[PATCH] No need to clean temp_git_file_* anymore Ancient cat-file command used to leave temp_git_file_* and there was support to remove them in the clean target of Makefile. I do not think it is needed anymore. From: Junio C Hamano <junkio@cox.net> Signed-off-by: Petr Baudis <pasky@ucw.cz>	20 years ago
Petr Baudis	bdd4da595a	[PATCH] Make nsec checking optional The nsec field of ctime/mtime is now checked only with -DNSEC defined during compilation. nsec acts broken since it is stored in the icache but apparently just gets to zero when flushed to filesystem not supporting it (e.g. ext3), creating illusions of false changes. At least that's my impression. Signed-off-by: Petr Baudis <pasky@ucw.cz>	20 years ago
Petr Baudis	5c2a7fbc36	[PATCH] SHA1 naive collision checking When compiled with -DCOLLISION_CHECK, we will check against SHA1 collisions when writing to the object database. From: Christopher Li <chrislgit@chrisli.org> Signed-off-by: Petr Baudis <pasky@ucw.cz>	20 years ago
Petr Baudis	7912c07037	[PATCH] ls-tree for listing trees ls-tree tool provides just a way to export the binary tree objects to a usable text format. This is bound to be useful in variety of scripts, although none of those I have currently uses it. But e.g. the simple script I've sent to HPA for purging the object database uses it. Signed-off-by: Petr Baudis <pasky@ucw.cz>	20 years ago
Linus Torvalds	853916ff7f	Add "applypatch" and "dotest" scripts to tie it all together. This should be getting it all pretty close to a working setup.	20 years ago
Linus Torvalds	74b46e32cb	Add a "check-files" command, which is useful for scripting patches. In particular, it verifies that all the listed files are up-to-date in the cache (or don't exist and are ready to be added).	20 years ago
Linus Torvalds	2744b2344d	Start of early patch applicator tools for git. I looked a bit at my old BK tools for the same thing, but they were just so horrid in many ways that I largely rewrote it all and these tools do things a bit differently. Instead of aggressively piping data from one process to another (which was clever but very hard to follow), this first just splits out the mbox into many smaller email files, and then does some scripts on these temporary files.	20 years ago
Linus Torvalds	8695c8bfe1	Add "show-files" command to show the list of managed (or non-managed) files. You want things like this to check in a patch..	20 years ago
Linus Torvalds	84fe972055	Add a "rev-tree" helper, which calculates the revision tree graph. It's quite fast when the commit-objects are cached, but since it has to walk every single commit-object, it also allows you to cache an old state and just add on top of that.	20 years ago
Linus Torvalds	9174026cfe	Add "diff-tree" program to show which files have changed between two trees. Very useful for creating diffs efficiently, and in general to see what has changed in the namespace.	20 years ago
Linus Torvalds	33db5f4d90	Add a "checkout-cache" command which does what the name suggests. I'll also eventually change "read-tree" to only update the cache information, instead of doing a checkout of the tree. Much nicer.	20 years ago
Linus Torvalds	9426167765	Add "-lz" to link line to get in zlib. Not all Linux distributions seem to need it (notably not YDL on ppc64), but enough ones obviously do.	20 years ago
Linus Torvalds	7660a188df	Add new fsck-cache to Makefile. This is what happens when there are no nice tools to tell you to do things properly.	20 years ago
Linus Torvalds	19b2860cba	Use "-Wall -O2" for the compiler to get more warnings. And fix up the warnings that it pointed out. Let's keep the tree clean from early on. Not that the code is very beautiful anyway ;)	20 years ago
Linus Torvalds	e83c516331	Initial revision of "git", the information manager from hell	20 years ago

... 2 3 4 5 6

286 Commits (9106c097ad87577019544f45fda11c4d73986597)