mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'po/diff-patch-doc'
Doc update. * po/diff-patch-doc: doc: point to diff attribute in patch format docs
This commit is contained in:
commit
e60e9cc20e
|
@ -11,7 +11,7 @@ linkgit:git-diff-files[1]
|
|||
with the `-p` option produces patch text.
|
||||
You can customize the creation of patch text via the
|
||||
`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables
|
||||
(see linkgit:git[1]).
|
||||
(see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5]).
|
||||
|
||||
What the -p option produces is slightly different from the traditional
|
||||
diff format:
|
||||
|
@ -74,6 +74,11 @@ separate lines indicate the old and the new mode.
|
|||
rename from b
|
||||
rename to a
|
||||
|
||||
5. Hunk headers mention the name of the function to which the hunk
|
||||
applies. See "Defining a custom hunk-header" in
|
||||
linkgit:gitattributes[5] for details of how to tailor to this to
|
||||
specific languages.
|
||||
|
||||
|
||||
Combined diff format
|
||||
--------------------
|
||||
|
|
Loading…
Reference in a new issue