TGit icon indicating copy to clipboard operation
TGit copied to clipboard

Published 20 hours ago • verified publisher icon sboulema

TGit->Commit replaces the merge message generated by Git.

Open GreenKn1ght opened this issue 7 years ago • 3 comments

GreenKn1ght avatar Jun 08 '17 05:06 GreenKn1ght

Check the new 4.4 release!

An empty default commit message will not replace the merge message anymore. Added support for TortoiseGit's BugTraq so you can configure a default bug id so using TGIT will still prepend/append the commit message

sboulema avatar Jun 08 '17 13:06 sboulema

What if I use not empty default commit message? In most cases I want use specified template, but after merge I want commit with default Git's commit message. Git generates message like this (which I can see if I call Git Commit from explorer):

Merge remote-tracking branch 'remotes/origin/feature/faeture/BranchA' into feature/BranchB
# Conflicts:
#	src/text.txt

TGit -> Commit will replace it to my Default commit message.

GreenKn1ght avatar Jun 08 '17 16:06 GreenKn1ght

Not sure yet on how to accomplish this...

TortoiseGit isnt playing nice with git hooks: https://gitlab.com/tortoisegit/tortoisegit/issues/1091

sboulema avatar Jun 22 '17 14:06 sboulema