mirror of
https://github.com/git/git.git
synced 2024-11-08 18:23:01 +01:00
3240240ff4
The OPTIONS section of a documentation file contains a list of the options a git command accepts. Currently there are several variants to describe the case that different options (almost) do the same in the OPTIONS section. Some are: -f, --foo:: -f|--foo:: -f | --foo:: But AsciiDoc has the special form: -f:: --foo:: This patch applies this form to the documentation of the whole git suite, and removes useless em-dash prevention, so \--foo becomes --foo. Signed-off-by: Stephan Beyer <s-beyer@gmx.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.4 KiB
Text
58 lines
1.4 KiB
Text
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 "git-diff-index" and "git-diff-tree".
|
|
|
|
OPTIONS
|
|
-------
|
|
include::diff-options.txt[]
|
|
|
|
-1 -2 -3 or --base --ours --theirs, and -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
|
|
|
|
Output format
|
|
-------------
|
|
include::diff-format.txt[]
|
|
|
|
|
|
Author
|
|
------
|
|
Written by Linus Torvalds <torvalds@osdl.org>
|
|
|
|
Documentation
|
|
--------------
|
|
Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
|
|
|
|
GIT
|
|
---
|
|
Part of the linkgit:git[1] suite
|