Linux笔记之diff工具软件P4merge的使用

Linux笔记之diff工具软件P4merge的使用

code review!

参考博文:

Ubuntu Git可视化比较工具 P4Merge 的安装/配置及使用

1.安装和配置

$ wget https://cdist2.perforce.com/perforce/r18.2/bin.linux26x86_64/p4v.tgz

$ tar zxvf p4v.tgz

$ sudo mkdir /opt/p4v

$ cd p4v-2018.2.1666551

$ sudo mv * /opt/p4v

$ sudo ln -s /opt/p4v/bin/p4merge /usr/local/bin/p4merge
1
2
3
4
5
6
7
8
9
10
11

2.使用：p4merge a.cc b.cc

3.配置git

在~/.gitconfig文件的末尾追加以下内容

[merge]
        keepBackup = false
        tool = p4merge
[mergetool]
        prompt = false
[mergetool "p4merge"]
        cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
        keepTemporaries = false
        trustExitCode = false
        keepBackup = false
[diff]
        tool = p4merge
[difftool]
        prompt = false
[difftool "p4merge"]
        cmd = p4merge "$LOCAL" "$REMOTE"
        keepTemporaries = false
        trustExitCode = false
        keepBackup = false
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19

使用以下命令启动视图：

git difftool
1

注意不是 git diff