diff options
| author |  Pratyush Yadav <me@yadavpratyush.com> | 2021-02-22 20:19:53 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2021-02-22 20:19:53 +0530 |
| commit | b1056f60b63f1bc8226d01881bc829e171fc78bf (patch) | |
| tree | 980c9403b749b7f9c5d8b99d271c94c695ffc540 /git-gui.sh | |
| parent | Merge branch 'mk/russian-translation' (diff) | |
| parent | git-gui: remove lines starting with the comment character (diff) | |
| download | tgif-b1056f60b63f1bc8226d01881bc829e171fc78bf.tar.xz | |
Merge branch 'py/commit-comments'
Use git-stripspace to remove comment lines from the commit message. Also
use it to clean up whitespace instead of rolling our own logic.
* py/commit-comments:
git-gui: remove lines starting with the comment character
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 201524c34e..236bc4e61d 100755 --- a/git-gui.sh +++ b/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 |