![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| 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) |
* 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.
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.
| 1 | 2 | |||
|---|---|---|---|---|
| git-merge.sh | patch | | diff1 | | diff2 | | blob | history |
| unpack-trees.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-merge.sh
Simple merge
diff --cc unpack-trees.c
Simple merge