Merge branch 'js/reset'
authorJunio C Hamano <gitster@pobox.com>
Sun, 11 Nov 2007 23:19:24 +0000 (15:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 Nov 2007 23:19:24 +0000 (15:19 -0800)
* js/reset:
builtin-reset: avoid forking "update-index --refresh"
builtin-reset: do not call "ls-files --unmerged"

1  2 
builtin-reset.c
diff --cc builtin-reset.c
Simple merge