diff options
| author | Pratyush Yadav <me@yadavpratyush.com> | 2021-03-04 13:59:45 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2021-03-04 13:59:45 +0530 |
| commit | df4f9e28f64ea97032ec70d9c8894dc87a1b7f9e (patch) | |
| tree | e2b2168c6221cb66258582b0b7a3db73aef8fe57 /git-gui.sh | |
| parent | b1056f60b63f1bc8226d01881bc829e171fc78bf (diff) | |
| parent | c0698df0579a14270e491b2f1ffdfc39d3b86310 (diff) | |
| download | git-df4f9e28f64ea97032ec70d9c8894dc87a1b7f9e.tar.gz | |
Merge branch 'py/revert-commit-comments'
This commit causes breakage on macOS, or in fact any platform using
older versions of Tcl. Revert it.
* py/revert-commit-comments:
Revert "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, 0 insertions, 5 deletions
diff --git a/git-gui.sh b/git-gui.sh index 236bc4e61d..201524c34e 100755 --- a/git-gui.sh +++ b/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 |