tree a006af88cbd92c2d303387447e8120a046338d24
parent 371820d5f1bb3c3e691ad21cee652c02c36ea758
parent fa6f225e0141ec0df1e131e894a3a7d7dea168f5
author Junio C Hamano <gitster@pobox.com> 1548794876 -0800
committer Junio C Hamano <gitster@pobox.com> 1548794876 -0800

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