org/kernel/git.git - forked from git/git

	Commit message (Collapse)	Author	Age
*	sparse cleanup	Linus Torvalds	2005-05-20
\| \| \| \| \| \| \| \| \|	Fix various things that sparse complains about: - use NULL instead of 0 - make sure we declare everything properly, or mark it static - use proper function declarations ("fn(void)" instead of "fn()") Sparse is always right.
*	[PATCH] cleanup of in-code names	Alexey Nezhdanov	2005-05-19
\| \| \| \| \| \| \|	Fixes all in-code names that leaved during "big name change". Signed-off-by: Alexey Nezhdanov <snake@penza-gsm.ru> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
*	merge-base: use the new lookup_commit_reference() helper function	Linus Torvalds	2005-05-18
\| \| \| \|	This allows you to use tags for merge bases.
*	Add "get_sha1()" helper function.	Linus Torvalds	2005-05-01
\| \| \| \| \| \| \| \| \| \| \| \|	This allows the programs to use various simplified versions of the SHA1 names, eg just say "HEAD" for the SHA1 pointed to by the .git/HEAD file etc. For example, this commit has been done with git-commit-tree $(git-write-tree) -p HEAD instead of the traditional "$(cat .git/HEAD)" syntax.
*	[PATCH] Allow multiple date-ordered lists	Daniel Barkalow	2005-04-23
\| \| \| \| \| \| \| \| \| \| \|	Make pop_most_recent_commit() return the same objects multiple times, but only if called with different bits to mark. This is necessary to make merge-base work again. Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
*	[PATCH] Replace merge-base implementation	Daniel Barkalow	2005-04-23
\| \| \| \| \| \| \| \| \| \|	The old implementation was a nice algorithm, but, unfortunately, it could be confused in some cases and would not necessarily do the obvious thing if one argument was decended from the other. This version fixes that by changing the criterion to the most recent common ancestor. Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
*	Merge the new object model thing from Daniel Barkalow	Linus Torvalds	2005-04-18
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	This was a real git merge with conflicts. I'll commit the scripts I used to do the merge next. Not pretty, but it's half-way functional.
\| *	[PATCH] Switch implementations of merge-base, port to parsing	Daniel Barkalow	2005-04-18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This switches to my implementation of merge-base, but with the new parsing library. Signed-Off-By: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* \|	Make "parse_commit" return the "struct revision" for the commit.	Linus Torvalds	2005-04-17
\|/ \| \| \| \| \| \| \|	Also, make it a fatal error to pass in a non-commit object. The callers never checked, so better check here. This simplifies merge-base further. It's now so trivial that it's almost ridiculous.
*	Do a very simple "merge-base" that finds the most recent common	Linus Torvalds	2005-04-17
	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.