Merge branch 'jc/index-output'
commitee9693e246669f48f6b058a1044cefa973a44c22
authorJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 09:26:24 +0000 (7 02:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 7 Apr 2007 09:26:24 +0000 (7 02:26 -0700)
tree80f0985cb14b578e9d13c04ad39a47dd8eccb3a2
parent39415449ee9b0bfbd6026e38c6e5d43f99759bf2
parent5e7f56ac33f7a5583f9fa4e0b6088709fea7a6f8
Merge branch 'jc/index-output'

* jc/index-output:
  git-read-tree --index-output=<file>
  _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.

Conflicts:

builtin-apply.c
builtin-add.c
builtin-apply.c
builtin-mv.c
builtin-update-index.c
cache.h
merge-recursive.c