mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://github.com/prati0100/git-gui

Browse Source 
* https://github.com/prati0100/git-gui:
  Revert "git-gui: remove lines starting with the comment character"
This commit is contained in:
Junio C Hamano
2021-03-04 12:38:50 -08:00
parent f01623b2c9 df4f9e28f6
commit 85c787f1e9
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
git-gui/git-gui.sh
View File

@ -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