Merge with git://repo.or.cz/git.git#next

This commit is contained in:
Johannes Sixt
2007-01-29 14:46:37 +01:00
113 changed files with 1751 additions and 927 deletions

2
gitk
View File

@@ -6193,7 +6193,7 @@ set wrcomcmd "git diff-tree --stdin -p --pretty"
set gitencoding {}
catch {
set gitencoding [exec git repo-config --get i18n.commitencoding]
set gitencoding [exec git config --get i18n.commitencoding]
}
if {$gitencoding == ""} {
set gitencoding "utf-8"