From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 May 2021 23:26:09 +0000 (+0900)
Subject: Merge branch 'ow/no-dryrun-in-add-i'
X-Git-Tag: v2.32.0-rc0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47fa10661746e32cbc76a88392e1cda38def27c6;p=thirdparty%2Fgit.git

Merge branch 'ow/no-dryrun-in-add-i'

"git add -i --dry-run" does not dry-run, which was surprising.  The
combination of options has taught to error out.

* ow/no-dryrun-in-add-i:
  add: die if both --dry-run and --interactive are given
---

47fa10661746e32cbc76a88392e1cda38def27c6