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

sboulema / TGit

Control TortoiseGit from within Visual Studio

MIT License

31 stars 9 forks source link

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

Open GreenKn1ght opened 7 years ago

sboulema commented 7 years ago

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

GreenKn1ght commented 7 years ago

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.

sboulema commented 7 years ago

Not sure yet on how to accomplish this...

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