blocks|key|1592169|text|您可以通过将core.pager设置为空字符串来禁用寻呼机：|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|1592170|git+config+--global+core.pager+''|code-block|syntax|javascript|1592171|entityMap^0|6|A|0|0^^$0|@$1|2|3|4|5|6|7|M|8|@$9|N|A|O|B|C]]|D|@]|E|$]]|$1|F|3|G|5|H|7|P|8|@]|D|@]|E|$I|J]]|$1|K|3|-4|5|6|7|Q|8|@]|D|@]|E|$]]]|L|$]]

You can disable the pager by setting <code>core.pager</code> to an empty string:

<pre><code>git config --global core.pager ''
</code></pre>

blocks|key|4716907|text|默认情况下，git+diff使用“通用”格式diff+-u。cvs+diff使用较旧的标准diff格式(删除了标记为<的行，添加了标记为>的行，每个差异周围没有上下文)。|type|unstyled|depth|inlineStyleRanges|offset|length|style|CODE|entityRanges|data|4716908|例如，您可以使用git+diff+-c或git+diff+-C5来获取“上下文差异”，以获得5行上下文，而不是默认的3行。|4716909|diff+--normal+(至少如果您正在使用GNU+diffutils)将生成一个老式的diff，但是git+diff似乎不能识别--normal选项。|4716910|就我个人而言，我发现上下文差异比老式差异更具可读性，所以我从来没有发现在git+diff中使用老式差异的必要性。尝试git+diff+-c+(连同haggai_e的建议禁用寻呼机)。|4716911|如果你真的想要老式的区别(<，>，没有上下文)，可能有一种方法可以做到。|4716912|编辑:|BOLD|4716913|如果git+diff不能完成您想要的操作，您可以提取文件修订版的副本，并对其使用您喜欢的任何比较工具。我自己的get-versions工具可以从git+(或者RCS或CVS)中提取一个文件的多个版本。|4716914|这是另一个解决方案，虽然有点复杂。作为示例，我已经为git本身克隆了git代码库。如果我想要比较顶级README文件的两个连续版本，我可以这样做：|4716915|$+diff+--normal+<(git+show+779d7e93773a0dcf918dc77023511fdc68161bd8:README)+\
++++++++++++++++<(git+show+71ce415dc088f19a0b8d6c8567dfdd6d851842b2:README)
24,26c24,25
<+compatible+with+the+GPLv2).
<+It+was+originally+written+by+Linus+Torvalds+with+help+of+a+group+of
<+hackers+around+the+net.+It+is+currently+maintained+by+Junio+C+Hamano.
---
>+compatible+with+the+GPLv2).+It+was+originally+written+by+Linus
>+Torvalds+with+help+of+a+group+of+hackers+around+the+net.
$+|code-block|syntax|javascript|4716916|将其封装在一个小脚本中将非常容易。|4716917|请注意，:+(上面示例中的README)后面的文件路径是相对于存储库的根目录的，而不是相对于当前目录的。您可以在名称前面加上./+to+make，以使其相对于当前目录。(后者可能不适用于某些旧版本的git。)|4716918|entityMap|0|LINK|mutability|MUTABLE|url|https://github.com/Keith-S-Thompson/get-versions^0|6|8|M|7|U|8|1M|1|1W|1|0|8|B|K|C|0|0|D|1H|8|1V|8|0|10|8|1M|B|0|D|1|F|1|0|0|3|0|2|8|1J|C|1J|C|0|0|Q|3|1E|6|0|0|0|4|1|D|6|1Q|2|0^^$0|@$1|2|3|4|5|6|7|1B|8|@$9|1C|A|1D|B|C]|$9|1E|A|1F|B|C]|$9|1G|A|1H|B|C]|$9|1I|A|1J|B|C]|$9|1K|A|1L|B|C]]|D|@]|E|$]]|$1|F|3|G|5|6|7|1M|8|@$9|1N|A|1O|B|C]|$9|1P|A|1Q|B|C]]|D|@]|E|$]]|$1|H|3|I|5|6|7|1R|8|@$9|1S|A|1T|B|C]|$9|1U|A|1V|B|C]|$9|1W|A|1X|B|C]]|D|@]|E|$]]|$1|J|3|K|5|6|7|1Y|8|@$9|1Z|A|20|B|C]|$9|21|A|22|B|C]]|D|@]|E|$]]|$1|L|3|M|5|6|7|23|8|@$9|24|A|25|B|C]|$9|26|A|27|B|C]]|D|@]|E|$]]|$1|N|3|O|5|6|7|28|8|@$9|29|A|2A|B|P]]|D|@]|E|$]]|$1|Q|3|R|5|6|7|2B|8|@$9|2C|A|2D|B|C]|$9|2E|A|2F|B|C]]|D|@$9|2G|A|2H|1|2I]]|E|$]]|$1|S|3|T|5|6|7|2J|8|@$9|2K|A|2L|B|C]|$9|2M|A|2N|B|C]]|D|@]|E|$]]|$1|U|3|V|5|W|7|2O|8|@]|D|@]|E|$X|Y]]|$1|Z|3|10|5|6|7|2P|8|@]|D|@]|E|$]]|$1|11|3|12|5|6|7|2Q|8|@$9|2R|A|2S|B|C]|$9|2T|A|2U|B|C]|$9|2V|A|2W|B|C]]|D|@]|E|$]]|$1|13|3|-4|5|6|7|2X|8|@]|D|@]|E|$]]]|14|$15|$5|16|17|18|E|$19|1A]]]]

<code>git diff</code> uses the "universal" format, <code>diff -u</code>, by default. <code>cvs diff</code> uses the older standard diff format (deleted lines marked with <code>&lt;</code>, added lines marked with <code>&gt;</code>, no context around each difference).

You can get a "context diff" using <code>git diff -c</code>, or <code>git diff -C5</code>, for example, to get 5 lines of context rather than the default 3.

<code>diff --normal</code> (at least if you're using GNU diffutils) will produce an old-style diff, but <code>git diff</code> doesn't seem to recognize the <code>--normal</code> option.

Personally, I find context diffs much more readable than old-style diffs, so I've never found the need to use old-style diffs with <code>git diff</code>. Try <code>git diff -c</code> (along with haggai_e's suggestion to disable the pager).

If you really want the old-style diffs (<code>&lt;</code>, <code>&gt;</code>, no context), there's probably a way to do it.

EDIT :

If <code>git diff</code> doesn't do what you want, you can extract copies of the revisions of the file and use whatever diff tool you like on them. My own <a href="https://github.com/Keith-S-Thompson/get-versions" rel="nofollow"><code>get-versions</code></a> tool can extract multiple versions of a file from git (or from RCS or CVS).

And here's another solution, though it's a bit more complicated. As an example, I've cloned the git repo for <code>git</code> itself. If I want to compare two successive versions of the top-level <code>README</code> file, I can do this:

<pre><code>$ diff --normal &lt;(git show 779d7e93773a0dcf918dc77023511fdc68161bd8:README) \
 &lt;(git show 71ce415dc088f19a0b8d6c8567dfdd6d851842b2:README)
24,26c24,25
&lt; compatible with the GPLv2).
&lt; It was originally written by Linus Torvalds with help of a group of
&lt; hackers around the net. It is currently maintained by Junio C Hamano.
---
&gt; compatible with the GPLv2). It was originally written by Linus
&gt; Torvalds with help of a group of hackers around the net.
$ 
</code></pre>

It would be easy enough to wrap this in a small script.

Note that the file path following the <code>:</code> (<code>README</code> in the above example) is relative to the root of the repository, not to the current directory. You can precede the name with <code>./</code> to make to make it relative to the current directory. (The latter might not work with some older versions of git.)

blocks|key|4716950|text|尝试使用标准比较格式：|type|unstyled|depth|inlineStyleRanges|entityRanges|data|4716951|git+difftool+-y+-x+"diff+--unchanged-group-format=''+--old-line-format='<+%25L'+--new-line-format='>+%25L'"|code-block|syntax|javascript|4716952|这给出了类似CVS的新行和老行，没有上下文，但它不会在不同行的组之间插入额外的内容。我不太确定如何实现剩下的部分，因为我不知道您会在多大程度上喜欢类似CVS的格式。|4716953|man+diff|4716954|了解更多信息|4716955|另请参阅|4716956|git+difftool+-y+-x+"diff+-n"|4716957|但我怀疑这不是你想要的。如果这对你有效，为了让它每次都能用git+diff工作，请参阅Configuring+diff+tool+with+.gitconfig?，它在接受的答案中引用了http://jeetworks.com/node/90。|offset|length|4716958|entityMap|0|LINK|mutability|MUTABLE|url|https://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig|1|http://jeetworks.com/node/90^0|0|0|0|0|0|0|0|17|12|0|2L|S|1|0^^$0|@$1|2|3|4|5|6|7|14|8|@]|9|@]|A|$]]|$1|B|3|C|5|D|7|15|8|@]|9|@]|A|$E|F]]|$1|G|3|H|5|6|7|16|8|@]|9|@]|A|$]]|$1|I|3|J|5|D|7|17|8|@]|9|@]|A|$E|F]]|$1|K|3|L|5|6|7|18|8|@]|9|@]|A|$]]|$1|M|3|N|5|6|7|19|8|@]|9|@]|A|$]]|$1|O|3|P|5|D|7|1A|8|@]|9|@]|A|$E|F]]|$1|Q|3|R|5|6|7|1B|8|@]|9|@$S|1C|T|1D|1|1E]|$S|1F|T|1G|1|1H]]|A|$]]|$1|U|3|-4|5|6|7|1I|8|@]|9|@]|A|$]]]|V|$W|$5|X|Y|Z|A|$10|11]]|12|$5|X|Y|Z|A|$10|13]]]]

Try playing with standard diff formatting:

<pre><code>git difftool -y -x "diff --unchanged-group-format='' --old-line-format='&lt; %L' --new-line-format='&gt; %L'"
</code></pre>

This gives CVS-like newlines and oldlines, with no context, but it doesn't insert the extras between groups of different lines. Not quite sure how to achieve the rest, given I don't know the extent to which you would like CVS-like formatting.

<pre><code>man diff
</code></pre>

For more information

Also see

<pre><code>git difftool -y -x "diff -n"
</code></pre>

But I doubt this does what you want. If this does work for you, to make it work every time with git diff, see <a href="https://stackoverflow.com/questions/6412516/configuring-diff-tool-with-gitconfig">Configuring diff tool with .gitconfig?</a>, which references <a href="http://jeetworks.com/node/90" rel="nofollow noreferrer">http://jeetworks.com/node/90</a> in the accepted answer.

Is there any way to make the output format of git diffs like cvs style diffs? I find git diffs to be less readable. Also, the git diffs appearing in <code>more</code> are annoying - how can I disable this?

CVS style diffs in git

翻译质量差，导致语言生硬或混乱。

没有提供实际的解决方法或示例。

解答不清晰，无法理解或解决问题。

页面排版不美观，阅读体验差。

文章

问答

视频

学习中心

腾讯云实验室

直播

竞赛

腾讯云代码分析专区

腾讯iOA零信任安全管理系统专区

腾讯云架构师技术同盟交流圈

腾讯云数据库专区

腾讯云顾问专区

腾讯云原生专区

腾讯混元专区

腾讯云TCE专区

腾讯云Lighthouse专区

腾讯云HAI专区

腾讯云Edgeone专区

腾讯云存储专区

腾讯云智能专区

腾讯轻联专区 

腾讯云开发专区

TAPD专区

腾讯轻量云游戏服专区

腾讯云最具价值专家

腾讯云架构师技术同盟

腾讯云创作之星

腾讯云开发者先锋

腾讯云代码助手

云原生构建

TAPD 敏捷项目管理

Cloud Studio

SDK中心

API中心

命令行工具

涵盖代码开发、场景应用、自动测试全流程，助你从零构建专属AI助手

一站式MCP教程库，解锁AI应用新玩法

有没有办法让git的输出格式不同于cvs风格？我发现git的不同之处可读性较差。此外，more中出现的git差异也很烦人--我该如何禁用它呢？

问git中的CVS样式差异
EN

Stack Overflow用户

社区

活动

圈层

关于

腾讯云开发者

热门产品

热门推荐

更多推荐

问git中的CVS样式差异EN