mirror of
https://github.com/git/git
synced 2024-09-17 23:41:33 +00:00
48bb914ed6
The point of these sections is generally to:
1. Give credit where it is due.
2. Give the reader an idea of where to ask questions or
file bug reports.
But they don't do a good job of either case. For (1), they
are out of date and incomplete. A much more accurate answer
can be gotten through shortlog or blame. For (2), the
correct contact point is generally git@vger, and even if you
wanted to cc the contact point, the out-of-date and
incomplete fields mean you're likely sending to somebody
useless.
So let's drop the fields entirely from all manpages except
git(1) itself. We already point people to the mailing list
for bug reports there, and we can update the Authors section
to give credit to the major contributors and point to
shortlog and blame for more information.
Each page has a "This is part of git" footer, so people can
follow that to the main git manpage.
52 lines
1.2 KiB
Plaintext
52 lines
1.2 KiB
Plaintext
git-diff-files(1)
|
|
=================
|
|
|
|
NAME
|
|
----
|
|
git-diff-files - Compares files in the working tree and the index
|
|
|
|
|
|
SYNOPSIS
|
|
--------
|
|
'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 on nonexistent files
|
|
|
|
|
|
include::diff-format.txt[]
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|