diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2025-01-20 01:56:02 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-01-21 12:56:06 -0800 |
| commit | 1f010d6bdf756129db13d1367c888aa4153f6d87 (patch) | |
| tree | 715708841b4980198157a60e72028e25a0059177 /Documentation/git-diff-files.txt | |
| parent | ed4cf6e8e29bebb9324ba1a400a6c07513f2d642 (diff) | |
| download | git-1f010d6bdf756129db13d1367c888aa4153f6d87.tar.gz | |
doc: use .adoc extension for AsciiDoc files
We presently use the ".txt" extension for our AsciiDoc files. While not
wrong, most editors do not associate this extension with AsciiDoc,
meaning that contributors don't get automatic editor functionality that
could be useful, such as syntax highlighting and prose linting.
It is much more common to use the ".adoc" extension for AsciiDoc files,
since this helps editors automatically detect files and also allows
various forges to provide rich (HTML-like) rendering. Let's do that
here, renaming all of the files and updating the includes where
relevant. Adjust the various build scripts and makefiles to use the new
extension as well.
Note that this should not result in any user-visible changes to the
documentation.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt deleted file mode 100644 index bf78e31431..0000000000 --- a/Documentation/git-diff-files.txt +++ /dev/null @@ -1,52 +0,0 @@ -git-diff-files(1) -================= - -NAME ----- -git-diff-files - Compares files in the working tree and the index - - -SYNOPSIS --------- -[verse] -'git diff-files' [-q] [-0 | -1 | -2 | -3 | -c | --cc] [<common-diff-options>] [<path>...] - -DESCRIPTION ------------ -Compares the files in the working tree and the index. When paths -are specified, compares only those named paths. Otherwise all -entries in the index are compared. The output format is the -same as for 'git diff-index' and 'git diff-tree'. - -OPTIONS -------- -include::diff-options.txt[] - --1 --base:: --2 --ours:: --3 --theirs:: --0:: - Diff against the "base" version, "our branch", or "their - branch" respectively. With these options, diffs for - merged entries are not shown. -+ -The default is to diff against our branch (-2) and the -cleanly resolved paths. The option -0 can be given to -omit diff output for unmerged entries and just show "Unmerged". - --c:: ---cc:: - This compares stage 2 (our branch), stage 3 (their - branch), and the working tree file and outputs a combined - diff, similar to the way 'diff-tree' shows a merge - commit with these flags. - --q:: - Remain silent even for nonexistent files - - -include::diff-format.txt[] - -GIT ---- -Part of the linkgit:git[1] suite |