summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLibravatar yaras <yaras6@gmail.com>2016-02-23 11:55:46 +0000
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2016-10-03 23:27:14 +0100
commitaf465c0c28d2b299c08613e97d6df0ec23d86fbb (patch)
tree8e80e78730d623080c25625c2f77710abc70e179 /lib
parentgit-gui/po/glossary/txt-to-pot.sh: use the $( ... ) construct for command sub... (diff)
downloadtgif-af465c0c28d2b299c08613e97d6df0ec23d86fbb.tar.xz
git-gui: fix initial git gui message encoding
This fix refers https://github.com/git-for-windows/git/issues/664 After `git merge --squash` git creates .git/SQUASH_MSG (UTF-8 encoded) which contains squashed commits. When run `git gui` it copies SQUASH_MSG to PREPARE_COMMIT_MSG, but without honoring UTF-8. This leads to encoding problems on `git gui` commit prompt. The same applies on git cherry-pick conflict, where MERGE_MSG is created and then is copied to PREPARE_COMMIT_MSG. In both cases PREPARE_COMMIT_MSG must be configured to store data in UTF-8. Signed-off-by: yaras <yaras6@gmail.com> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions