From d1308c94810c75505d88a14193b328bc413a0473 Mon Sep 17 00:00:00 2001
From: Junio C Hamano
Date: Sun, 16 Apr 2006 11:01:09 +0000
Subject: [PATCH] Autogenerated HTML docs for v1.3.0-rc4-g4024
---
diff-options.txt | 3 +++
git-diff-files.html | 10 +++++++++-
git-diff-index.html | 10 +++++++++-
git-diff-stages.html | 10 +++++++++-
git-diff-tree.html | 10 +++++++++-
5 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/diff-options.txt b/diff-options.txt
index 447e522a..c183dc9d 100644
--- a/diff-options.txt
+++ b/diff-options.txt
@@ -10,6 +10,9 @@
--stat::
Generate a diffstat instead of a patch.
+--patch-with-stat::
+ Generate patch and prepend its diffstat.
+
-z::
\0 line termination on output
diff --git a/git-diff-files.html b/git-diff-files.html
index d66d18a6..b016af61 100644
--- a/git-diff-files.html
+++ b/git-diff-files.html
@@ -317,6 +317,14 @@ same as "git-diff-index" and "git-diff-tree".
+--patch-with-stat
+
+
+
+ Generate patch and prepend its diffstat.
+
+
+
-z
@@ -830,7 +838,7 @@ two unresolved merge parents with the working tree file