1
我刚刚在我公司的HP-UX计算机上将git更新到版本1.8.4。从git版本1.8.4输出虚假字符
$ git diff
1mdiff --git a/pg/wop/pgmwo.4gl b/pg/wop/pgmwo.4glmm
1mindex 0764c3b..f9f99a8 100644mm
1m--- a/pg/wop/pgmwo.4glmm
1m+++ b/pg/wop/pgmwo.4glmm
[email protected]@ -2194,8 +2194,9 @@m mRKH090805}mm
DELETE FROM woshortmm
WHERE line_recno = f_wodet_recnomm
ELSEmm
31m- UPDATE woshortmm
31m- SET qty_short = f_shortmm
32m+m32m UPDATE woshort SETmm
32m+m32m qty_short = f_short,mm
32m+m32m line_no = g_wodet_rec.linenomm
WHERE line_recno = f_wodet_recnomm
END IFmm
END IFmm
[email protected]@ -5521,8 +5522,9 @@m mDEFINE f_wodet_recno LIKE wodet.recno,mm
DELETE FROM woshortmm
WHERE line_recno = f_wodet_recnomm
ELSEmm
31m- UPDATE woshortmm
31m- SET qty_short = f_shortmm
当我回去Git版本1.8.3.4不会发生这种情况:现在我在终端上输入git差异时,我得到看到虚假的字符,例如。我使用depothelper来安装git及其依赖项。它看起来像彩色格式代码,但我们的终端都是单色的。
我们的服务器是HP-UX B.11.31 U ia64(tr)。我们通常使用带有wy60终端配置的SmarTerm连接到服务器。
我缺少什么配置?
EDIT
我还看到在从诸如git log
命令输出的每一行的端部的字母“M”。例如:
$ git log
commit ded5bfda75018bee84e3b81ca6f7a5f1dcf035cdm
Merge: 196862d 777b10dm
Author: Richard Holyoak <[email protected]>m
Date: Mon Sep 30 13:51:49 2013 +0100m
m
Merge branch '9328'm
m
commit 777b10d09eb828e250283b74a22df52662d1897cm
Author: Richard Holyoak <[email protected]>m
Date: Mon Sep 30 13:50:09 2013 +0100m
m
9328 pgmwo: V1-10-06 Updates to woshort ensure that the line number is also
m m
I don't think this is the root cause of the woshort line numberm
being out-of-step with the wodet line number but it will help.m
m
commit 196862de9817b6205263bbf7b14855db158feadem
Merge: 34d84af 07bf5b8m
Author: Richard Holyoak <[email protected]>m
Date: Fri Sep 27 13:25:32 2013 +0100m
m
Merge branch '11420'm
m
明白了。非常感谢您提供这样一个及时的答案。 –
但是,我注意到,每行末尾仍有一个字母m。我想这是一个回车或换行代码。我如何压制这一点? –
你可以尝试'git config --global autocrlf false'吗?这是否解决了这个问题? – Mureinik