summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-03-04 20:38:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-03-04 20:38:50 (GMT)
commit85c787f1e9476c3b8cbeeb4656973d0f1efd9881 (patch)
treeda9739938af80bd6f236db9aa0a95709d22f374f /git-gui/git-gui.sh
parentf01623b2c9d14207e497b21ebc6b3ec4afaf4b46 (diff)
parentdf4f9e28f64ea97032ec70d9c8894dc87a1b7f9e (diff)
downloadgit-85c787f1e9476c3b8cbeeb4656973d0f1efd9881.zip
git-85c787f1e9476c3b8cbeeb4656973d0f1efd9881.tar.gz
git-85c787f1e9476c3b8cbeeb4656973d0f1efd9881.tar.bz2
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-xgit-gui/git-gui.sh5
1 files changed, 0 insertions, 5 deletions
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 236bc4e..201524c 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