projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d0085ad 22f741d)
Merge branch 'jc/read-tree-ignore'
authorJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:10:24 +0000 (11:10 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 13 Dec 2006 19:10:24 +0000 (11:10 -0800)
commitf388cec3d77751a6c20b3b10415344f5355b5a2f
tree557f4a01f9da0851617f290aa556e56e5c07092btree | snapshot
parentd0085ade9598942077f12f22b16978411d15188acommit | diff
parent22f741dab7cc93f00f7cf96cd65d7481677cd855commit | 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.
git-merge.sh diff1 | diff2 | blob | history
unpack-trees.c diff1 | diff2 | blob | history
Git—the stupid content tracker