diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-03-01 17:22:18 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-01 17:22:18 (GMT) |
| commit | 90917373cd21f60ccd2636e067a0c2685d29d0d5 (patch) | |
| tree | fb6e29771e3b5f132136931ff745fa461f0fd80f /git-gui/git-gui.sh | |
| parent | c0b27e3964b3300969660119fe12a863cfcae912 (diff) | |
| parent | b1056f60b63f1bc8226d01881bc829e171fc78bf (diff) | |
| download | git-90917373cd21f60ccd2636e067a0c2685d29d0d5.zip git-90917373cd21f60ccd2636e067a0c2685d29d0d5.tar.gz git-90917373cd21f60ccd2636e067a0c2685d29d0d5.tar.bz2 | |
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui:
git-gui: remove lines starting with the comment character
git-gui: fix typo in russian locale
Diffstat (limited to 'git-gui/git-gui.sh')
| -rwxr-xr-x | git-gui/git-gui.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 201524c..236bc4e 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -875,6 +875,7 @@ 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 @@ -3436,6 +3437,10 @@ 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 |