git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 5 Dec 2006 00:00:46 +0000 (16:00 -0800)
committer	Junio C Hamano <redacted>
	Wed, 6 Dec 2006 07:25:52 +0000 (23:25 -0800)
commit	f8a9d4287277ed15d3f0d61004f4510c59f1f392
tree	b3a75baf61f97d601d2e4d7cf79c8399b902d9bf	tree \| snapshot
parent	8ebe185bbf3f1f4f59bcc61e3d1849a76f6af983	commit \| diff

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 <redacted>

builtin-read-tree.c		diff \| blob \| history
dir.c		diff \| blob \| history
dir.h		diff \| blob \| history
t/t1004-read-tree-m-u-wf.sh		diff \| blob \| history
unpack-trees.c		diff \| blob \| history
unpack-trees.h		diff \| blob \| history

RSS Atom

git clone https://git.99rst.org/PROJECT