Hi all, This patch series addresses a bug in interpret-trailers. If the commit that is being editted is "verbose", it will contain a scissors string ("-- >8 --") and a diff. interpret-trailers doesn't interpret the scissors and therefore places trailer information after the diff. A simple reproduction is: git config commit.verbose true GIT_EDITOR='git interpret-trailers --in-place --trailer Acked-by:me' \ git commit --amend This patch series fixes the issue by obeying scissors when computing trailers location. P.S. This is my first patch series to the git mailing list, to feel free to point out any mistakes I made when submitting. commit.c | 65 ++++++++++++++++++++++++++++++++++++++++--- commit.h | 1 + mailinfo.c | 53 +---------------------------------- t/t7513-interpret-trailers.sh | 17 +++++++++++ 4 files changed, 80 insertions(+), 56 deletions(-)