Tree: 261044e85d

Commit Graph

2 Commits (261044e85ddac3de48dc74dd9c416c95147022ad)

Author	SHA1	Message	Date
Johannes Schindelin	ef90d6d420	Provide git_config with a callback-data parameter ... git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Junio C Hamano	525ab63950	merge-recursive: split low-level merge functions out. ... This moves low-level merge functions out of merge-recursive.c and places them in a new separate file, ll-merge.c Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago