From 17869a19d49e02e5ef86701818a748d481e2ef3e Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 19 Jun 2012 19:42:05 +0200 Subject: [PATCH] RebaseDlg: better format message on squash Signed-off-by: Sven Strickroth --- src/TortoiseProc/RebaseDlg.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/TortoiseProc/RebaseDlg.cpp b/src/TortoiseProc/RebaseDlg.cpp index c13caff91..228c57609 100644 --- a/src/TortoiseProc/RebaseDlg.cpp +++ b/src/TortoiseProc/RebaseDlg.cpp @@ -1324,9 +1324,11 @@ int CRebaseDlg::DoRebase() if (!CheckNextCommitIsSquash() || mode != CTGitPath::LOGACTIONS_REBASE_PICK) { // next commit is squash or not pick - this->m_SquashMessage+= pRev->GetSubject(); - this->m_SquashMessage+= _T("\n"); - this->m_SquashMessage+= pRev->GetBody(); + if (!this->m_SquashMessage.IsEmpty()) + this->m_SquashMessage += _T("\n\n"); + this->m_SquashMessage += pRev->GetSubject(); + this->m_SquashMessage += _T("\n"); + this->m_SquashMessage += pRev->GetBody().TrimRight(); } else this->m_SquashMessage.Empty(); -- 2.11.4.GIT