ba020ef5eb
The names of git commands are not meant to be entered at the
commandline; they are just names. So we render them in italics,
as is usual for command names in manpages.
Using
doit () {
perl -e 'for (<>) { s/\`(git-[^\`.]*)\`/'\''\1'\''/g; print }'
}
for i in git*.txt config.txt diff*.txt blame*.txt fetch*.txt i18n.txt \
merge*.txt pretty*.txt pull*.txt rev*.txt urls*.txt
do
doit <"$i" >"$i+" && mv "$i+" "$i"
done
git diff
.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
59 lines
1.4 KiB
Plaintext
59 lines
1.4 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 -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
|