Merge branch 'jk/add-i-mode'
commitce47dc077549d4952908a5377ab36474b2bd8446
authorJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2008 07:29:24 +0000 (9 00:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 9 Apr 2008 07:29:24 +0000 (9 00:29 -0700)
tree9b568c44db1488c2eb636bca33d0395f9545f25f
parentba9f517bdd2062d1d90d37e5b10d1688d48bc225
parentca7246864b43e9ea1922cc5386225ecd1b3bdd98
Merge branch 'jk/add-i-mode'

* jk/add-i-mode:
  add--interactive: allow user to choose mode update
  add--interactive: ignore mode change in 'p'atch command