Merge branch 'jk/add-i-mode'
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2008 07:29:24 +0000 (00:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2008 07:29:24 +0000 (00:29 -0700)
* jk/add-i-mode:
  add--interactive: allow user to choose mode update
  add--interactive: ignore mode change in 'p'atch command


Trivial merge