Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
GreenKn1ght opened this issue Jun 8, 2017 · 3 comments
Open

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

GreenKn1ght opened this issue Jun 8, 2017 · 3 comments
Assignees
@sboulema
Labels
enhancement
Projects
TGit
Milestone
vNext

Comments

@GreenKn1ght
Copy link

No description provided.

sboulema added a commit that referenced this issue Jun 8, 2017
@sboulema
Ignore commit message template if empty, Add support for BugTraq, #32
9c7d8af
@sboulema sboulema self-assigned this Jun 8, 2017
@sboulema sboulema added this to the 4.4 milestone Jun 8, 2017
@sboulema
Copy link
Owner

sboulema commented Jun 8, 2017

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
Copy link
Author

GreenKn1ght commented Jun 8, 2017 •
edited

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 sboulema modified the milestones: vNext, 4.4 Jun 21, 2017
@sboulema
Copy link
Owner

Not sure yet on how to accomplish this...

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

@sboulema sboulema added this to To do in TGit Feb 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@sboulema sboulema

Labels
enhancement
Projects
TGit
  
To do
Milestone
vNext
Development

No branches or pull requests
2 participants
@sboulema @GreenKn1ght