一个文件中代码被多个人份,如何确定这行代码是谁更改的呢?
可以使用如下命令:
-l 后跟的两个数字代表要查找的开始行数和结束行数,后面路径为要查找的文件路径+文件名。
git blame -L 1480,1500 skyworth/Skyworth/Admin/Controller/SalesController.class.php
下面就是执行命令后的结果:
显示顺序依次为: 版本号、作者、时间、行号 、代码行
D:\360Downloads\wamp\www\factory>git blame -L 1480,1500 skyworth/Skyworth/Admin/Controller/SalesController.class.php
4cf29ad47 (zws 2019-05-09 16:12:35 +0800 1480) if (I(‘brand’)){
4cf29ad47 (zws 2019-05-09 16:12:35 +0800 1481) $map[‘brand’] = I(‘brand’);
4cf29ad47 (zws 2019-05-09 16:12:35 +0800 1482) }
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1483) if (I(‘machinetype’))
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1484) $map[‘machinetype’] = I(‘machinetype’);
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1485) if (I(‘producttype’))
e90c94ff5 (denghuaijie 2019-04-17 11:08:14 +0800 1486) $map[‘type’] = I(‘producttype’)-1;
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1487) if (I(‘keyword’)) {
0a2374e3a (denghuaijie 2019-05-07 16:05:18 +0800 1488)
m
a
p
[
′
p
a
r
t
v
e
r
s
i
o
n
∣
t
i
t
l
e
∣
p
a
r
t
a
n
u
m
b
e
r
′
]
=
a
r
r
a
y
(
′
l
i
k
e
′
,
"
map['partversion|title|partanumber'] = array('like', "%" . addslashes(trim(
map[′partversion∣title∣partanumber′]=array(′like′,"_GET[‘keyword’])) . “%”);
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1489) }
3f88eff65 (zws 2019-05-09 17:19:07 +0800 1490) if(C(‘HXJTYPE’)==1 && session(‘level’) == 2){
3f88eff65 (zws 2019-05-09 17:19:07 +0800 1491) $map[‘adminid’] = array(‘in’,‘3,’.session(‘uid’));
3f88eff65 (zws 2019-05-09 17:19:07 +0800 1492) }else{
3f88eff65 (zws 2019-05-09 17:19:07 +0800 1493) $map[‘adminid’] = array(‘gt’,0);
3f88eff65 (zws 2019-05-09 17:19:07 +0800 1494) }
0a2374e3a (denghuaijie 2019-05-07 16:05:18 +0800 1495) $map[‘isshow’] = 1; //<8A><9E>
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1496) $page = I(‘p’) ? I(‘p’) : 1;
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1497)
99b860b47 (denghuaijie 2019-04-14 19:17:48 +0800 1498)
c
o
u
n
t
=
M
(
"
p
r
o
d
u
c
t
o
n
s
a
l
e
"
)
−
>
w
h
e
r
e
(
count = M("product_onsale")->where(
count=M("productonsale")−>where(map)->count();
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1499) KaTeX parse error: Undefined control sequence: \Think at position 15: organ_p = new \̲T̲h̲i̲n̲k̲\AjaxPage(count, 10, ‘getpart’);
eb17ef676 (Jovy 2018-11-27 14:22:12 +0800 1500) $data[‘part_page’] = $organ_p->show();