From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jan 2019 20:47:56 +0000 (-0800)
Subject: Merge branch 'js/add-e-clear-patch-before-stating'
X-Git-Tag: v2.21.0-rc0~59
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fa92ba40abbe4236226e7d91e664bbeab8c43f2;p=thirdparty%2Fgit.git

Merge branch 'js/add-e-clear-patch-before-stating'

"git add -e" got confused when the change it wants to let the user
edit is smaller than the previous change that was left over in a
temporary file.

* js/add-e-clear-patch-before-stating:
  add --edit: truncate the patch file
---

7fa92ba40abbe4236226e7d91e664bbeab8c43f2