3 commits

Author	SHA1	Message	Date
Junio C Hamano	f8a9d42872	read-tree: further loosen "working file will be lost" check. ... 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>	2006-12-05 23:25:52 -08:00
Johannes Schindelin	076b0adcf9	read-tree: move merge functions to the library ... 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>	2006-07-30 23:31:39 -07:00
Johannes Schindelin	16da134b1f	read-trees: refactor the unpack_trees() part ... 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>	2006-07-30 23:31:31 -07:00