summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-tree.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-12-19 11:33:56 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-12-19 11:33:56 -0800
commite7d1b526d18fcbfb7a003ce971f8ce45827e495e (patch)
treedc7c7a224596609bd3a46cb6c0aab4fd539b2c92 /Documentation/git-merge-tree.txt
parentMerge branch 'bw/pathspec-match-submodule-boundary' (diff)
parentMerge branch 'ls/no-double-utf8-author-name' of ../git-gui into ls/git-gui-no... (diff)
downloadtgif-e7d1b526d18fcbfb7a003ce971f8ce45827e495e.tar.xz
Merge branch 'ls/git-gui-no-double-utf8-author-name'
Amending commits in git-gui broke the author name that is non-ascii due to incorrect enconding conversion. * ls/git-gui-no-double-utf8-author-name: git-gui: prevent double UTF-8 conversion
Diffstat (limited to 'Documentation/git-merge-tree.txt')
0 files changed, 0 insertions, 0 deletions