author | Junio C Hamano <junkio@cox.net> | |
Wed, 13 Dec 2006 19:10:24 +0000 (11:10 -0800) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 13 Dec 2006 19:10:24 +0000 (11:10 -0800) | ||
commit | f388cec3d77751a6c20b3b10415344f5355b5a2f | |
tree | 557f4a01f9da0851617f290aa556e56e5c07092b | tree | snapshot |
parent | d0085ade9598942077f12f22b16978411d15188a | commit | diff |
parent | 22f741dab7cc93f00f7cf96cd65d7481677cd855 | commit | diff |
Merge branch 'jc/read-tree-ignore'
* jc/read-tree-ignore:
read-tree: document --exclude-per-directory
Loosen "working file will be lost" check in Porcelain-ish
read-tree: further loosen "working file will be lost" check.
* jc/read-tree-ignore:
read-tree: document --exclude-per-directory
Loosen "working file will be lost" check in Porcelain-ish
read-tree: further loosen "working file will be lost" check.
git-merge.sh | diff1 | | diff2 | | blob | history |
unpack-trees.c | diff1 | | diff2 | | blob | history |