<feed xmlns='http://www.w3.org/2005/Atom'>
<title>git/Documentation/git-diff.txt, branch v1.7.2</title>
<subtitle>Mirror of https://git.kernel.org/pub/scm/git/git.git/
</subtitle>
<id>https://git.shady.money/git/atom?h=v1.7.2</id>
<link rel='self' href='https://git.shady.money/git/atom?h=v1.7.2'/>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/'/>
<updated>2010-07-05T20:39:13Z</updated>
<entry>
<title>Documentation: link to gitrevisions rather than git-rev-parse</title>
<updated>2010-07-05T20:39:13Z</updated>
<author>
<name>Michael J Gruber</name>
<email>git@drmicha.warpmail.net</email>
</author>
<published>2010-07-05T16:11:41Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=f028cdae6663166ebfd777e73aacce1f5e7159d6'/>
<id>urn:sha1:f028cdae6663166ebfd777e73aacce1f5e7159d6</id>
<content type='text'>
Currently, whenever we need documentation for revisions and ranges, we
link to the git-rev-parse man page, i.e. a plumbing man page, which has
this along with the documentation of all rev-parse modes.

Link to the new gitrevisions man page instead in all cases except
- when the actual git-rev-parse command is referred to or
- in very technical context (git-send-pack).

Signed-off-by: Michael J Gruber &lt;git@drmicha.warpmail.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>git-diff.txt: Link to git-difftool</title>
<updated>2010-01-10T06:41:31Z</updated>
<author>
<name>David Aguilar</name>
<email>davvid@gmail.com</email>
</author>
<published>2010-01-10T04:02:43Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=3bdfd44309822d4a2c49d381999ad5cc7e61ed5f'/>
<id>urn:sha1:3bdfd44309822d4a2c49d381999ad5cc7e61ed5f</id>
<content type='text'>
Signed-off-by: David Aguilar &lt;davvid@gmail.com&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>git-diff: Add --staged as a synonym for --cached.</title>
<updated>2008-11-11T22:55:43Z</updated>
<author>
<name>David Symonds</name>
<email>dsymonds@gmail.com</email>
</author>
<published>2008-10-29T16:15:36Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=2baf1850ceb01dfbee862e30f2a69cf6064e13eb'/>
<id>urn:sha1:2baf1850ceb01dfbee862e30f2a69cf6064e13eb</id>
<content type='text'>
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Documentation: be consistent about "git-" versus "git "</title>
<updated>2008-07-02T00:20:15Z</updated>
<author>
<name>Jonathan Nieder</name>
<email>jrnieder@uchicago.edu</email>
</author>
<published>2008-06-30T06:09:04Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=b1889c36d85514e5e70462294c561a02c2edfe2b'/>
<id>urn:sha1:b1889c36d85514e5e70462294c561a02c2edfe2b</id>
<content type='text'>
Since the git-* commands are not installed in $(bindir), using
"git-command &lt;parameters&gt;" in examples in the documentation is
not a good idea. On the other hand, it is nice to be able to
refer to each command using one hyphenated word. (There is no
escaping it, anyway: man page names cannot have spaces in them.)

This patch retains the dash in naming an operation, command,
program, process, or action. Complete command lines that can
be entered at a shell (i.e., without options omitted) are
made to use the dashless form.

The changes consist only of replacing some spaces with hyphens
and vice versa. After a "s/ /-/g", the unpatched and patched
versions are identical.

Signed-off-by: Jonathan Nieder &lt;jrnieder@uchicago.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>documentation: move git(7) to git(1)</title>
<updated>2008-06-06T18:18:28Z</updated>
<author>
<name>Christian Couder</name>
<email>chriscool@tuxfamily.org</email>
</author>
<published>2008-06-06T07:07:32Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=9e1f0a85c68323830ea117092c55192b17aa3ac8'/>
<id>urn:sha1:9e1f0a85c68323830ea117092c55192b17aa3ac8</id>
<content type='text'>
As the "git" man page describes the "git" command at the end-user
level, it seems better to move it to man section 1.

Signed-off-by: Christian Couder &lt;chriscool@tuxfamily.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Documentation: rename gitlink macro to linkgit</title>
<updated>2008-01-07T02:41:44Z</updated>
<author>
<name>Dan McGee</name>
<email>dpmcgee@gmail.com</email>
</author>
<published>2007-12-29T06:20:38Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=5162e69732d13dd079919a389a6ace8878aad716'/>
<id>urn:sha1:5162e69732d13dd079919a389a6ace8878aad716</id>
<content type='text'>
Between AsciiDoc 8.2.2 and 8.2.3, the following change was made to the stock
Asciidoc configuration:

@@ -149,7 +153,10 @@
 # Inline macros.
 # Backslash prefix required for escape processing.
 # (?s) re flag for line spanning.
-(?su)[\\]?(?P&lt;name&gt;\w(\w|-)*?):(?P&lt;target&gt;\S*?)(\[(?P&lt;attrlist&gt;.*?)\])=
+
+# Explicit so they can be nested.
+(?su)[\\]?(?P&lt;name&gt;(http|https|ftp|file|mailto|callto|image|link)):(?P&lt;target&gt;\S*?)(\[(?P&lt;attrlist&gt;.*?)\])=
+
 # Anchor: [[[id]]]. Bibliographic anchor.
 (?su)[\\]?\[\[\[(?P&lt;attrlist&gt;[\w][\w-]*?)\]\]\]=anchor3
 # Anchor: [[id,xreflabel]]

This default regex now matches explicit values, and unfortunately in this
case gitlink was being matched by just 'link', causing the wrong inline
macro template to be applied. By renaming the macro, we can avoid being
matched by the wrong regex.

Signed-off-by: Dan McGee &lt;dpmcgee@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Documentation: customize diff-options depending on particular command</title>
<updated>2007-11-16T06:44:17Z</updated>
<author>
<name>Sergei Organov</name>
<email>osv@javad.com</email>
</author>
<published>2007-11-15T13:19:29Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=c1a95fa629b837fd291ca0e1428604710a2bc1dd'/>
<id>urn:sha1:c1a95fa629b837fd291ca0e1428604710a2bc1dd</id>
<content type='text'>
Customize diff-options depending on particular command as follows,
mostly to make git-diff and git-format-patch manuals less confusing:

* git-format-patch:

  - Mark --patch-with-stat as being the default.

  - Change -p description so that it matches what it actually does and
    so that it doesn't refer to absent "section on generating
    patches".

* git-diff: mark -p as being the default.

* git-diff-index/git-diff-files/git-diff-tree: mark --raw as being
  the default.

Signed-off-by: Sergei Organov &lt;osv@javad.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
<entry>
<title>Merge branch 'gp/maint-diffdoc'</title>
<updated>2007-11-02T23:12:04Z</updated>
<author>
<name>Junio C Hamano</name>
<email>gitster@pobox.com</email>
</author>
<published>2007-11-02T23:12:04Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=784c099a30368af4238e2713e6220688119239a1'/>
<id>urn:sha1:784c099a30368af4238e2713e6220688119239a1</id>
<content type='text'>
* gp/maint-diffdoc:
  git-diff.txt: add section "output format" describing the diff formats
</content>
</entry>
<entry>
<title>git-diff.txt: add section "output format" describing the diff formats</title>
<updated>2007-11-02T00:07:22Z</updated>
<author>
<name>Gerrit Pape</name>
<email>pape@smarden.org</email>
</author>
<published>2007-10-31T13:59:16Z</published>
<link rel='alternate' type='text/html' href='https://git.shady.money/git/commit/?id=9e6c723087def70d001740db48cf042b77a1d9cd'/>
<id>urn:sha1:9e6c723087def70d001740db48cf042b77a1d9cd</id>
<content type='text'>
git-diff.txt includes diff-options.txt which for the -p option refers
to a section "generating patches.." which is missing from the git-diff
documentation.  This patch adapts diff-format.txt to additionally
mention the git-diff program, and includes diff-format.txt into
git-diff.txt.

Tino Keitel noticed this problem.

Signed-off-by: Gerrit Pape &lt;pape@smarden.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
</content>
</entry>
</feed>
