From 6959c6c419acf390c79b816b7117da3cac54db71 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 May 2006 10:34:11 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.3.3-g63df --- diff-options.txt | 4 ++++ git-diff-files.html | 11 ++++++++++- git-diff-index.html | 11 ++++++++++- git-diff-stages.html | 11 ++++++++++- git-diff-tree.html | 11 ++++++++++- git-merge-base.html | 29 +++++++++++++++++++++++------ git-merge-base.txt | 18 ++++++++++++++---- git-rebase.html | 12 ++++++------ git-rebase.txt | 11 +++++------ git-rev-parse.html | 26 +++++++++++++++++++++++++- git-rev-parse.txt | 9 +++++++++ 11 files changed, 126 insertions(+), 27 deletions(-) diff --git a/diff-options.txt b/diff-options.txt index c183dc9d..f523ec2f 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -10,6 +10,10 @@ --stat:: Generate a diffstat instead of a patch. +--summary:: + Output a condensed summary of extended header information + such as creations, renames and mode changes. + --patch-with-stat:: Generate patch and prepend its diffstat. diff --git a/git-diff-files.html b/git-diff-files.html index b016af61..21977657 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -317,6 +317,15 @@ same as "git-diff-index" and "git-diff-tree".

+--summary +
+
+

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

+
+
--patch-with-stat
@@ -838,7 +847,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 993707a2..802e3a1d 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -318,6 +318,15 @@ entries in the index are compared.

+--summary +
+
+

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

+
+
--patch-with-stat
@@ -928,7 +937,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index 0b2c06b8..82a423f4 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -315,6 +315,15 @@ unmerged index file.

+--summary +
+
+

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

+
+
--patch-with-stat
@@ -812,7 +821,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 0a2f8213..bab73a82 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -320,6 +320,15 @@ git-diff-tree(1) Manual Page

+--summary +
+
+

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

+
+
--patch-with-stat
@@ -1000,7 +1009,7 @@ two unresolved merge parents with the working tree file diff --git a/git-merge-base.html b/git-merge-base.html index e18bd4df..bf965ea4 100644 --- a/git-merge-base.html +++ b/git-merge-base.html @@ -3,7 +3,7 @@ - +