From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 5 Feb 2014 22:01:09 +0000 (-0800)
Subject: Merge branch 'jl/commit-v-strip-marker' into maint
X-Git-Tag: v1.8.5.4~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a118beeddf9d0373078595dd1d1d5f33441a1cdd;p=thirdparty%2Fgit.git

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

"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
---

a118beeddf9d0373078595dd1d1d5f33441a1cdd