delta/git.git - github.com: git/git.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	read-tree: further loosen "working file will be lost" check.	Junio C Hamano	2006-12-05	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|	This follows up commit ed93b449 where we removed overcautious "working file will be lost" check. A new option "--exclude-per-directory=.gitignore" can be used to tell the "git-read-tree" command that the user does not mind losing contents in untracked files in the working tree, if they need to be overwritten by a merge (either a two-way "switch branches" merge, or a three-way merge). Signed-off-by: Junio C Hamano <junkio@cox.net>
*	read-tree: move merge functions to the library	Johannes Schindelin	2006-07-30	1	-0/+5
\| \| \| \| \| \| \| \|	This will allow merge-recursive to use the read-tree functionality without exec()ing git-read-tree. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
*	read-trees: refactor the unpack_trees() part	Johannes Schindelin	2006-07-30	1	-0/+30
	Basically, the options are passed by a struct unpack_trees_options now. That's all. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>