projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 371820d fa6f225)
Merge branch 'js/add-e-clear-patch-before-stating'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:56 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:56 +0000 (12:47 -0800)
commit7fa92ba40abbe4236226e7d91e664bbeab8c43f2
treea006af88cbd92c2d303387447e8120a046338d24tree | snapshot
parent371820d5f1bb3c3e691ad21cee652c02c36ea758commit | diff
parentfa6f225e0141ec0df1e131e894a3a7d7dea168f5commit | diff
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
builtin/add.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.