From: Junio C Hamano Date: Tue, 6 Mar 2007 09:58:26 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0.3-289-gba66 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=60f8aa808475ecf9f2b0c6c8e16fab7f1e070f3c;p=git.git Autogenerated HTML docs for v1.5.0.3-289-gba66 --- diff --git a/git-diff.html b/git-diff.html index 0a45472fa..8390e23b5 100644 --- a/git-diff.html +++ b/git-diff.html @@ -272,7 +272,7 @@ git-diff(1) Manual Page

SYNOPSIS

-

git-diff [ --diff-options ] <commit>{0,2} [--] [<path>…]

+

git-diff [<common diff options>] <commit>{0,2} [--] [<path>…]

DESCRIPTION

@@ -842,7 +842,7 @@ output diff in reverse.
diff --git a/git-diff.txt b/git-diff.txt index 12a531d1e..044cee9b4 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- -'git-diff' [ --diff-options ] {0,2} [--] [...] +'git-diff' [] {0,2} [--] [...] DESCRIPTION ----------- diff --git a/git-format-patch.html b/git-format-patch.html index 7c1d2875d..f1bdd8d4f 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -273,8 +273,8 @@ git-format-patch(1) Manual Page

SYNOPSIS

-
git-format-patch [-n | -k] [-o <dir> | --stdout] [--attach] [--thread] - [-s | --signoff] [--diff-options] [--start-number <n>] +
git-format-patch [<common diff options>] [-n | -k] [-o <dir> | --stdout] + [--attach] [--thread] [-s | --signoff] [--start-number <n>] [--in-reply-to=Message-Id] [--suffix=.<sfx>] [--ignore-if-in-upstream] <since>[..<until>]
@@ -306,6 +306,361 @@ reference.

+-p +
+
+

+ Generate patch (see section on generating patches) +

+
+
+-u +
+
+

+ Synonym for "-p". +

+
+
+--raw +
+
+

+ Generate the raw format. +

+
+
+--patch-with-raw +
+
+

+ Synonym for "-p --raw". +

+
+
+--stat[=width[,name-width]] +
+
+

+ Generate a diffstat. You can override the default + output width for 80-column terminal by "--stat=width". + The width of the filename part can be controlled by + giving another width to it separated by a comma. +

+
+
+--numstat +
+
+

+ Similar to --stat, but shows number of added and + deleted lines in decimal notation and pathname without + abbreviation, to make it more machine friendly. For + binary files, outputs two - instead of saying + 0 0. +

+
+
+--shortstat +
+
+

+ Output only the last line of the --stat format containing total + number of modified files, as well as number of added and deleted + lines. +

+
+
+--summary +
+
+

+ Output a condensed summary of extended header information + such as creations, renames and mode changes. +

+
+
+--patch-with-stat +
+
+

+ Synonym for "-p --stat". +

+
+
+-z +
+
+

+ \0 line termination on output +

+
+
+--name-only +
+
+

+ Show only names of changed files. +

+
+
+--name-status +
+
+

+ Show only names and status of changed files. +

+
+
+--color +
+
+

+ Show colored diff. +

+
+
+--no-color +
+
+

+ Turn off colored diff, even when the configuration file + gives the default to color output. +

+
+
+--color-words +
+
+

+ Show colored word diff, i.e. color words which have changed. +

+
+
+--no-renames +
+
+

+ Turn off rename detection, even when the configuration + file gives the default to do so. +

+
+
+--check +
+
+

+ Warn if changes introduce trailing whitespace + or an indent that uses a space before a tab. +

+
+
+--full-index +
+
+

+ Instead of the first handful characters, show full + object name of pre- and post-image blob on the "index" + line when generating a patch format output. +

+
+
+--binary +
+
+

+ In addition to --full-index, output "binary diff" that + can be applied with "git apply". +

+
+
+--abbrev[=<n>] +
+
+

+ Instead of showing the full 40-byte hexadecimal object + name in diff-raw format output and diff-tree header + lines, show only handful hexdigits prefix. This is + independent of --full-index option above, which controls + the diff-patch output format. Non default number of + digits can be specified with --abbrev=<n>. +

+
+
+-B +
+
+

+ Break complete rewrite changes into pairs of delete and create. +

+
+
+-M +
+
+

+ Detect renames. +

+
+
+-C +
+
+

+ Detect copies as well as renames. +

+
+
+--diff-filter=[ACDMRTUXB*] +
+
+

+ Select only files that are Added (A), Copied (C), + Deleted (D), Modified (M), Renamed (R), have their + type (mode) changed (T), are Unmerged (U), are + Unknown (X), or have had their pairing Broken (B). + Any combination of the filter characters may be used. + When * (All-or-none) is added to the combination, all + paths are selected if there is any file that matches + other criteria in the comparison; if there is no file + that matches other criteria, nothing is selected. +

+
+
+--find-copies-harder +
+
+

+ For performance reasons, by default, -C option finds copies only + if the original file of the copy was modified in the same + changeset. This flag makes the command + inspect unmodified files as candidates for the source of + copy. This is a very expensive operation for large + projects, so use it with caution. +

+
+
+-l<num> +
+
+

+ -M and -C options require O(n^2) processing time where n + is the number of potential rename/copy targets. This + option prevents rename/copy detection from running if + the number of rename/copy targets exceeds the specified + number. +

+
+
+-S<string> +
+
+

+ Look for differences that contain the change in <string>. +

+
+
+--pickaxe-all +
+
+

+ When -S finds a change, show all the changes in that + changeset, not just the files that contain the change + in <string>. +

+
+
+--pickaxe-regex +
+
+

+ Make the <string> not a plain string but an extended POSIX + regex to match. +

+
+
+-O<orderfile> +
+
+

+ Output the patch in the order specified in the + <orderfile>, which has one shell glob pattern per line. +

+
+
+-R +
+
+

+ Swap two inputs; that is, show differences from index or + on-disk file to tree contents. +

+
+
+--text +
+
+

+ Treat all files as text. +

+
+
+-a +
+
+

+ Shorthand for "--text". +

+
+
+--ignore-space-at-eol +
+
+

+ Ignore changes in white spaces at EOL. +

+
+
+--ignore-space-change +
+
+

+ Ignore changes in amount of white space. This ignores white + space at line end, and consider all other sequences of one or + more white space characters to be equivalent. +

+
+
+-b +
+
+

+ Shorthand for "--ignore-space-change". +

+
+
+--ignore-all-space +
+
+

+ Ignore white space when comparing lines. This ignores + difference even if one line has white space where the other + line has none. +

+
+
+-w +
+
+

+ Shorthand for "--ignore-all-space". +

+
+
+

For more detailed explanation on these common options, see also +diffcore documentation.

+
+
-o|--output-directory <dir>
@@ -491,7 +846,7 @@ git-format-patch -3
diff --git a/git-format-patch.txt b/git-format-patch.txt index 59f34b9f0..84eabebe0 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -9,8 +9,8 @@ git-format-patch - Prepare patches for e-mail submission SYNOPSIS -------- [verse] -'git-format-patch' [-n | -k] [-o | --stdout] [--attach] [--thread] - [-s | --signoff] [--diff-options] [--start-number ] +'git-format-patch' [] [-n | -k] [-o | --stdout] + [--attach] [--thread] [-s | --signoff] [--start-number ] [--in-reply-to=Message-Id] [--suffix=.] [--ignore-if-in-upstream] [..] @@ -46,6 +46,8 @@ reference. OPTIONS ------- +include::diff-options.txt[] + -o|--output-directory :: Use to store the resulting files, instead of the current working directory. diff --git a/git.html b/git.html index 36ee03f0e..723423042 100644 --- a/git.html +++ b/git.html @@ -1506,6 +1506,17 @@ their operation accordingly.

+<commit-ish> +
+
+

+ Indicates a commit or tag object name. A + command that takes a <commit-ish> argument ultimately wants to + operate on a <commit> object but automatically dereferences + <tag> objects that point at a <commit>. +

+
+
<type>
@@ -2298,7 +2309,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 0577ad0a8..e875e8318 100644 --- a/git.txt +++ b/git.txt @@ -241,6 +241,12 @@ Identifier Terminology operate on a object but automatically dereferences and objects that point at a . +:: + Indicates a commit or tag object name. A + command that takes a argument ultimately wants to + operate on a object but automatically dereferences + objects that point at a . + :: Indicates that an object type is required. Currently one of: `blob`, `tree`, `commit`, or `tag`.