<feed xmlns='http://www.w3.org/2005/Atom'>
<title>git/Documentation/diff-format.txt, branch v2.16.2</title>
<subtitle>Mirror of https://git.kernel.org/pub/scm/git/git.git/
</subtitle>
<id>https://git.shady.money/git/atom?h=v2.16.2</id>
<link rel='self' href='https://git.shady.money/git/atom?h=v2.16.2'/>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/'/>
<updated>2017-03-02T19:40:51Z</updated>
<entry>
<title>Documentation: improve description for core.quotePath</title>
<updated>2017-03-02T19:40:51Z</updated>
<author>
<name>Andreas Heiduk</name>
<email>asheiduk@gmail.com</email>
</author>
<published>2017-03-02T19:03:52Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=860cd699c285f02937a2edbdb78e8231292339a5'/>
<id>urn:sha1:860cd699c285f02937a2edbdb78e8231292339a5</id>
<content type='text'>
Linking the description for pathname quoting to the configuration
variable "core.quotePath" removes inconstistent and incomplete
sections while also giving two hints how to deal with it: Either with
"-c core.quotePath=false" or with "-z".

Signed-off-by: Andreas Heiduk &lt;asheiduk@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>doc: typeset long command-line options as literal</title>
<updated>2016-06-28T15:36:45Z</updated>
<author>
<name>Matthieu Moy</name>
<email>Matthieu.Moy@imag.fr</email>
</author>
<published>2016-06-28T11:40:11Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=bcf9626a71a0d90be65acc265ad0ec488d95d6ed'/>
<id>urn:sha1:bcf9626a71a0d90be65acc265ad0ec488d95d6ed</id>
<content type='text'>
Similarly to the previous commit, use backquotes instead of
forward-quotes, for long options.

This was obtained with:

  perl -pi -e "s/'(--[a-z][a-z=&lt;&gt;-]*)'/\`\$1\`/g" *.txt

and manual tweak to remove false positive in ascii-art (o'--o'--o' to
describe rewritten history).

Signed-off-by: Matthieu Moy &lt;Matthieu.Moy@imag.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>doc: typeset short command-line options as literal</title>
<updated>2016-06-28T15:20:52Z</updated>
<author>
<name>Matthieu Moy</name>
<email>Matthieu.Moy@imag.fr</email>
</author>
<published>2016-06-28T11:40:10Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=23f8239bbe0a893bd8754a03e9d4fda62804ac14'/>
<id>urn:sha1:23f8239bbe0a893bd8754a03e9d4fda62804ac14</id>
<content type='text'>
It was common in our documentation to surround short option names with
forward quotes, which renders as italic in HTML. Instead, use backquotes
which renders as monospace. This is one more step toward conformance to
Documentation/CodingGuidelines.

This was obtained with:

  perl -pi -e "s/'(-[a-z])'/\`\$1\`/g" *.txt

Signed-off-by: Matthieu Moy &lt;Matthieu.Moy@imag.fr&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>diff-format doc: a score can follow M for rewrite</title>
<updated>2015-01-29T06:22:03Z</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2015-01-28T21:17:19Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=ac1c2d9a2129b1ccb2e570a2cdaf8522c58f9539'/>
<id>urn:sha1:ac1c2d9a2129b1ccb2e570a2cdaf8522c58f9539</id>
<content type='text'>
b6d8f309 (diff-raw format update take #2., 2005-05-23) started
documenting the diff format, and it said

 ...
 (8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
 (9) status, followed by similarlity index number only for C and R.
 (10) a tab or a NUL when '-z' option is used.
 ...

because C and R _were_ the only ones that came with a number back
then.  This was corrected by ddafa7e9 (diff-helper: Fix R/C score
parsing under -z flag., 2005-05-29) and we started saying "score"
instead of "similarlity index" (because we can have other kind of
score there), and stopped saying "only for C and R" (because Git is
an ever evolving system).  Later f345b0a0 (Add -B flag to diff-*
brothers., 2005-05-30) introduced a new concept, "dissimilarity"
score; it did not have to fix any documentation.

The current text that says only C and R can have scores came
independently from a5a323f3 (Add reference for status letters in
documentation., 2008-11-02) and it was wrong from the day one.

Noticed-by: Mike Hommey
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Fix typos in technical documentation.</title>
<updated>2010-01-31T18:24:53Z</updated>
<author>
<name>Ralf Wildenhues</name>
<email>Ralf.Wildenhues@gmx.de</email>
</author>
<published>2010-01-31T13:24:39Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566'/>
<id>urn:sha1:6a5d0b0a90789ed92cb87f1b69cfeef2a1db3566</id>
<content type='text'>
Signed-off-by: Ralf Wildenhues &lt;Ralf.Wildenhues@gmx.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Update the documentation of the raw diff output format</title>
<updated>2009-07-28T20:32:59Z</updated>
<author>
<name>David Kågedal</name>
<email>davidk@lysator.liu.se</email>
</author>
<published>2009-07-28T08:32:18Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=f552e51ef9d376c17fa707b7af9582108f4ec81c'/>
<id>urn:sha1:f552e51ef9d376c17fa707b7af9582108f4ec81c</id>
<content type='text'>
This includes mentioning the initial hash output of diff-tree, and
changes the header to "raw output format" which is more descriptive.

Signed-off-by: David Kågedal &lt;davidk@lysator.liu.se&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Documentation: fix typos, grammar, asciidoc syntax</title>
<updated>2008-12-20T03:10:46Z</updated>
<author>
<name>Markus Heidelberg</name>
<email>markus.heidelberg@web.de</email>
</author>
<published>2008-12-19T12:14:18Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2'/>
<id>urn:sha1:04c8ce9c1c803a8dc0f3728f57550f9bc9e605c2</id>
<content type='text'>
Signed-off-by: Markus Heidelberg &lt;markus.heidelberg@web.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Add reference for status letters in documentation.</title>
<updated>2008-11-02T23:57:10Z</updated>
<author>
<name>Yann Dirson</name>
<email>ydirson@altern.org</email>
</author>
<published>2008-11-02T13:37:28Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=a5a323f33cd25829e0dde3939b196cf743d7d9d8'/>
<id>urn:sha1:a5a323f33cd25829e0dde3939b196cf743d7d9d8</id>
<content type='text'>
Also fix error in diff_filepair::status documentation, and point to
the in-code reference as well as the doc.

Signed-off-by: Yann Dirson &lt;ydirson@altern.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>git-diff --numstat -z: make it machine readable</title>
<updated>2007-12-12T18:59:22Z</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2007-12-12T07:46:30Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=f604652e05073aaef6d83e83b5d6499b55bb6dfd'/>
<id>urn:sha1:f604652e05073aaef6d83e83b5d6499b55bb6dfd</id>
<content type='text'>
The "-z" format is all about machine parsability, but showing renamed
paths as "common/{a =&gt; b}/suffix" makes it impossible.  The scripts would
never have successfully parsed "--numstat -z -M" in the old format.

This fixes the output format in a (hopefully minimally) backward
incompatible way.

 * The output without -z is not changed.  This has given a good way for
   humans to view added and deleted lines separately, and showing the
   path in combined, shorter way would preserve readability.

 * The output with -z is unchanged for paths that do not involve renames.
   Existing scripts that do not pass -M/-C are not affected at all.

 * The output with -z for a renamed path is shown in a format that can
   easily be distinguished from an unrenamed path.

This is based on Jakub Narebski's patch.  Bugs and documentation typos
are mine.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Include diff options in the git-log manpage</title>
<updated>2007-12-05T09:57:40Z</updated>
<author>
<name>Miklos Vajna</name>
<email>vmiklos@frugalware.org</email>
</author>
<published>2007-11-01T14:57:40Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=272bd3cfd059cf867b979d5c11b0ccce9bcccbb3'/>
<id>urn:sha1:272bd3cfd059cf867b979d5c11b0ccce9bcccbb3</id>
<content type='text'>
[jc: with quite a few fixups]

Signed-off-by: Miklos Vajna &lt;vmiklos@frugalware.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
</feed>
