From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Mar 2017 20:56:42 +0000 (-0700)
Subject: Merge branch 'jk/add-i-patch-do-prompt' into maint
X-Git-Tag: v2.12.1~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=abe62a403f2d3fce004f57e0e7371523761e723f;p=git

Merge branch 'jk/add-i-patch-do-prompt' into maint

The patch subcommand of "git add -i" was meant to have paths
selection prompt just like other subcommand, unlike "git add -p"
directly jumps to hunk selection.  Recently, this was broken and
"add -i" lost the paths selection dialog, but it now has been
fixed.

* jk/add-i-patch-do-prompt:
  add--interactive: fix missing file prompt for patch mode with "-i"
---

abe62a403f2d3fce004f57e0e7371523761e723f