search

sublimehq / sublime_merge

Issue tracker for Sublime Merge
https://www.sublimemerge.com
271 stars 14 forks source link

Commit message lose annotation message #1784

Closed GentlemanHao closed 1 year ago

GentlemanHao commented 1 year ago

Version info

Description

Commit message lose annotation message

Steps to reproduce

Steps to reproduce the behavior:

  1. git merge ... contains conflicts
  2. Commit message like 
    
Merge branch 'featureA' into featureB

Conflicts:

local.properties


3. Commit this message
4. Gitlab commit message show "Merge branch 'featureA' into featureB"，Does not contain information that starts with #

**Expected behavior**

All information should be displayed

**Screenshots**

![image](https://github.com/sublimehq/sublime_merge/assets/23253887/4a9b09a9-e46b-4b34-885a-442f85411c29)
dpjohnst commented 1 year ago

Hi @GentlemanHao,

Thanks for reaching out!

By default, lines starting with # are treated as comments by Git, and are stripped when committing. You can disable this behavior by setting the Git configuration variable commit.cleanup to whitespace. i.e. run git config commit.cleanup whitespace

Kind regards, - Dylan from Sublime HQ