Merge branch 'jl/commit-v-strip-marker'

"git commit -v" appends the patch to the log message before
editing, and then removes the patch when the editor returned
control. However, the patch was not stripped correctly when the
first modified path was a submodule.

* jl/commit-v-strip-marker:
commit -v: strip diffs and submodule shortlogs from the commit message

diff --cc builtin/commit.c
Simple merge

diff --cc wt-status.c
index 4625cdb900f179e94314348340719b677fed1ca1,85390b813f12e2392b73dd6dffe8d1b41e838614..cd7d706a6344fd28b264db4b5c1ea02a2677512e
--- 1/wt-status.c
--- 2/wt-status.c
+++ b/wt-status.c
@@@ -15,8 -15,10 +15,11 @@@
  #include "submodule.h"
  #include "column.h"
  #include "strbuf.h"
 +#include "utf8.h"
  
+ static char cut_line[] =
+ "------------------------ >8 ------------------------\n";
+ 
  static char default_wt_status_colors[][COLOR_MAXLEN] = {
        GIT_COLOR_NORMAL, /* WT_STATUS_HEADER */
        GIT_COLOR_GREEN,  /* WT_STATUS_UPDATED */