diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-09 13:14:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-09 13:14:36 -0700 |
| commit | c6a20717bb5286cc140e1818d150f293bed5631b (patch) | |
| tree | 366ffca741a51319fca50f9193885942ec6fab68 /git-gui/git-gui.sh | |
| parent | 1ee85f0e215f22b0878d0ad4b2445d12bbb63887 (diff) | |
| parent | 309bb874dcba2c96f8b12d20bed16cf6a1ea0133 (diff) | |
Merge branch 'master' of https://github.com/j6t/git-gui
* 'master' of https://github.com/j6t/git-gui:
git-gui: treat the message template file as a built file
git-gui: heed core.commentChar/commentString
git-gui: po/README: update repository location and maintainer
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 887d6d596c..28572c889c 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -880,6 +880,12 @@ proc apply_config {} { color::sync_with_theme } } + + global comment_string + set comment_string [get_config core.commentstring] + if {$comment_string eq {}} { + set comment_string [get_config core.commentchar] + } } set default_config(branch.autosetupmerge) true @@ -890,6 +896,8 @@ set default_config(merge.summary) false set default_config(merge.verbosity) 2 set default_config(user.name) {} set default_config(user.email) {} +set default_config(core.commentchar) "#" +set default_config(core.commentstring) {} set default_config(gui.encoding) [encoding system] set default_config(gui.matchtrackingbranch) false |