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)
commit52b9b48a2c0cfd703cf95ae8b4913544c5497aba
tree6cfa6913b0f980f291d3e2bddb9f3b5b25b47c5b
parent91febfba6f86e77c0ed320ecf7d0704be13c25fe
parent620a6cd42ed5ea94684b22714181bf03871733dd
Merge branch 'js/reset'

* js/reset:
  builtin-reset: avoid forking "update-index --refresh"
  builtin-reset: do not call "ls-files --unmerged"
builtin-reset.c