From: Junio C Hamano Date: Tue, 26 Dec 2006 09:11:43 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.0-rc0-g6934 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d793de567fd684f8a0cf42af9252cb37cba2d2b0;p=git.git Autogenerated HTML docs for v1.5.0-rc0-g6934 --- diff --git a/diff-options.txt b/diff-options.txt index f12082e13..da1cc60e9 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -19,7 +19,9 @@ --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. + 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 diff --git a/git-apply.html b/git-apply.html index f71e40775..39605a61f 100644 --- a/git-apply.html +++ b/git-apply.html @@ -312,8 +312,9 @@ and a work tree.

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

@@ -582,7 +583,7 @@ apply.whitespace diff --git a/git-apply.txt b/git-apply.txt index 2cc32d1c5..33b93db50 100644 --- a/git-apply.txt +++ b/git-apply.txt @@ -33,8 +33,9 @@ OPTIONS --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. Turns - off "apply". + abbreviation, to make it more machine friendly. For + binary files, outputs two `-` instead of saying + `0 0`. Turns off "apply". --summary:: Instead of applying the patch, output a condensed diff --git a/git-diff-files.html b/git-diff-files.html index abcc5c864..a755740bb 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -334,7 +334,9 @@ same as "git-diff-index" and "git-diff-tree".

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

@@ -984,7 +986,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 8b4c6a016..ec23f3d78 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -335,7 +335,9 @@ entries in the index are compared.

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

@@ -1074,7 +1076,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 8c5fdb0f5..60d7cadc8 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -332,7 +332,9 @@ unmerged index file.

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

@@ -958,7 +960,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index bd0a9bfd2..a09faf5b8 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -337,7 +337,9 @@ git-diff-tree(1) Manual Page

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

@@ -1266,7 +1268,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 5bcb2969e..8fb0e4676 100644 --- a/git-diff.html +++ b/git-diff.html @@ -381,7 +381,9 @@ any <tree-ish>.

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

@@ -815,7 +817,7 @@ output diff in reverse. diff --git a/git-reset.html b/git-reset.html index d9a2baa37..d331aba3f 100644 --- a/git-reset.html +++ b/git-reset.html @@ -272,7 +272,9 @@ git-reset(1) Manual Page

SYNOPSIS

-

git-reset [--mixed | --soft | --hard] [<commit-ish>]

+
+
git-reset [--mixed | --soft | --hard] [<commit>] +git-reset [--mixed] <commit> [--] <paths>…

DESCRIPTION

@@ -283,6 +285,8 @@ commit (or set of commits) and want to redo that part without showing the undo in the history.

If you want to undo a commit other than the latest on a branch, git-revert(1) is your friend.

+

The second form with paths is used to revert selected paths in +the index from a given commit, without moving HEAD.

OPTIONS

@@ -315,11 +319,11 @@ the undo in the history.

Matches the working tree and index to that of the tree being switched to. Any changes to tracked files in the working tree - since <commit-ish> are lost. + since <commit> are lost.

-<commit-ish> +<commit>

@@ -566,7 +570,7 @@ At this point the index file still has all the WIP changes you

diff --git a/git-reset.txt b/git-reset.txt index 4a4ceb620..4f424782e 100644 --- a/git-reset.txt +++ b/git-reset.txt @@ -7,7 +7,9 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- -'git-reset' [--mixed | --soft | --hard] [] +[verse] +'git-reset' [--mixed | --soft | --hard] [] +'git-reset' [--mixed] [--] ... DESCRIPTION ----------- @@ -21,6 +23,10 @@ the undo in the history. If you want to undo a commit other than the latest on a branch, gitlink:git-revert[1] is your friend. +The second form with 'paths' is used to revert selected paths in +the index from a given commit, without moving HEAD. + + OPTIONS ------- --mixed:: @@ -37,9 +43,9 @@ OPTIONS --hard:: Matches the working tree and index to that of the tree being switched to. Any changes to tracked files in the working tree - since are lost. + since are lost. -:: +:: Commit to make the current HEAD. Examples diff --git a/git-show-branch.html b/git-show-branch.html index 13e5eb309..936e44c9d 100644 --- a/git-show-branch.html +++ b/git-show-branch.html @@ -275,7 +275,8 @@ git-show-branch(1) Manual Page
git-show-branch [--all] [--remotes] [--topo-order] [--current] [--more=<n> | --list | --independent | --merge-base] - [--no-name | --sha1-name] [--topics] [<rev> | <glob>]…
+ [--no-name | --sha1-name] [--topics] [<rev> | <glob>]… +git-show-branch --reflog[=<n>] <ref>

DESCRIPTION

@@ -428,6 +429,14 @@ no <rev> nor <glob> is given on the command line.

topic1 topic2"

+
+--reflog[=<n>] <ref> +
+
+

+ Shows <n> most recent ref-log entries for the given ref. +

+

Note that --more, --list, --independent and --merge-base options are mutually exclusive.

@@ -500,7 +509,7 @@ your topic branch, it is shown as well.

diff --git a/git-show-branch.txt b/git-show-branch.txt index dafacd430..912e15bcb 100644 --- a/git-show-branch.txt +++ b/git-show-branch.txt @@ -11,6 +11,7 @@ SYNOPSIS 'git-show-branch' [--all] [--remotes] [--topo-order] [--current] [--more= | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [ | ]... +'git-show-branch' --reflog[=] DESCRIPTION ----------- @@ -96,6 +97,10 @@ OPTIONS will show the revisions given by "git rev-list {caret}master topic1 topic2" +--reflog[=] :: + Shows most recent ref-log entries for the given ref. + + Note that --more, --list, --independent and --merge-base options are mutually exclusive.