git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - merge-cache.c

2005-05-19	Alexey Nezhdanov	[PATCH] cleanup of in-code names	blob \| commitdiff \| raw
2005-05-11	Petr Baudis	git-merge-cache -o does all the automerges in a single...	blob \| commitdiff \| raw \| diff to current
2005-05-11	Petr Baudis	Merge with http://members.cox.net/junkio/git-jc.git	blob \| commitdiff \| raw \| diff to current
2005-05-07	Petr Baudis	Make merge-cache not fail immediatelly when the merge...	blob \| commitdiff \| raw \| diff to current
2005-04-24	James Bottomley	[PATCH] make file merging respect permissions	blob \| commitdiff \| raw \| diff to current
2005-04-18	Linus Torvalds	Change merge-cache and git-merge-one-file to use the...	blob \| commitdiff \| raw \| diff to current
2005-04-18	Linus Torvalds	Merge the new object model thing from Daniel Barkalow	blob \| commitdiff \| raw \| diff to current
2005-04-18	Linus Torvalds	Ass a "merge-cache" helper program to execute a merge on	blob \| commitdiff \| raw \| diff to current

Unnamed repository; edit this file 'description' to name the repository.