From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 9 Apr 2008 07:29:24 +0000 (-0700)
Subject: Merge branch 'jk/add-i-mode'
X-Git-Tag: v1.5.6-rc0~159
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce47dc077549d4952908a5377ab36474b2bd8446;p=git.git

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
---

ce47dc077549d4952908a5377ab36474b2bd8446