From ba7c8d8333e364d5b3a960b19e3b0fc6e867c928 Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Sat, 15 Apr 2006 06:17:42 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.3.0-rc3-g170a
---
diff-options.txt | 3 +++
git-diff-files.html | 10 +++++++++-
git-diff-index.html | 10 +++++++++-
git-diff-stages.html | 10 +++++++++-
git-diff-tree.html | 10 +++++++++-
git-log.html | 41 +++++++++++++++++++++++++++++++++++------
git-log.txt | 24 ++++++++++++++++++++----
7 files changed, 94 insertions(+), 14 deletions(-)
diff --git a/diff-options.txt b/diff-options.txt
index 338014c8..447e522a 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -7,6 +7,9 @@
--patch-with-raw::
Generate patch but keep also the default raw diff output.
+--stat::
+ Generate a diffstat instead of a patch.
+
-z::
\0 line termination on output
diff --git a/git-diff-files.html b/git-diff-files.html
index 43afec50..d66d18a6 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -309,6 +309,14 @@ same as "git-diff-index" and "git-diff-tree".
+--stat
+
+
+
+ Generate a diffstat instead of a patch.
+
+
+
-z
@@ -822,7 +830,7 @@ two unresolved merge parents with the working tree file