diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-04 23:38:50 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-04 23:38:50 +0300 |
| commit | 85c787f1e9476c3b8cbeeb4656973d0f1efd9881 (patch) | |
| tree | da9739938af80bd6f236db9aa0a95709d22f374f /git-gui/git-gui.sh | |
| parent | f01623b2c9d14207e497b21ebc6b3ec4afaf4b46 (diff) | |
| parent | df4f9e28f64ea97032ec70d9c8894dc87a1b7f9e (diff) | |
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui:
Revert "git-gui: remove lines starting with the comment character"
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 236bc4e61d..201524c34e 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -875,7 +875,6 @@ 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(gui.encoding) [encoding system] set default_config(gui.matchtrackingbranch) false @@ -3437,10 +3436,6 @@ proc trace_commit_type {varname args} { merge {set txt [mc "Merge Commit Message:"]} * {set txt [mc "Commit Message:"]} } - - set comment_char [get_config core.commentchar] - set txt [string cat $txt \ - [mc " (Lines starting with '$comment_char' will be ignored)"]] $ui_coml conf -text $txt } trace add variable commit_type write trace_commit_type |