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

	Commit message (Expand)	Author	Age
...
* \|	fix openssl headers conflicting with custom SHA1 implementations	Nicolas Pitre	2008-10-02
* \|	Merge branch 'jc/better-conflict-resolution'	Shawn O. Pearce	2008-09-29
\|\ \
\| * \|	rerere: understand "diff3 -m" style conflicts with the original	Junio C Hamano	2008-08-30
\| * \|	rerere.c: use symbolic constants to keep track of parsing states	Junio C Hamano	2008-08-30
\| \|/
* \|	is_directory(): a generic helper function	Junio C Hamano	2008-09-09
\|/
*	Rename path_list to string_list	Johannes Schindelin	2008-07-21
*	rerere.autoupdate: change the message when autoupdate is in effect	Junio C Hamano	2008-07-16
*	Merge branch 'js/merge-rr'	Junio C Hamano	2008-07-14
*	rerere: Separate libgit and builtin functions	Stephan Beyer	2008-07-10