From 1b6885b7318aaa1056c576da3463baf923f55148 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Feb 2006 15:50:18 -0800 Subject: [PATCH] Autogenerated HTML docs for v1.1.6-g97f5 --- git-diff-tree.html | 4 ++-- git-diff-tree.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/git-diff-tree.html b/git-diff-tree.html index 036370e59..f44a2fc2f 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -564,7 +564,7 @@ separated with a single space are given.

parent, or show the same change from all but one parent for an Octopus merge. When this optimization makes all hunks disappear, the commit itself and the commit log - message is not shown, unless -m is specified. + message is not shown, just like any other "empty diff" cases.

@@ -930,7 +930,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.txt b/git-diff-tree.txt index dd46d4f05..674ee614c 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -93,7 +93,7 @@ separated with a single space are given. parent, or show the same change from all but one parent for an Octopus merge. When this optimization makes all hunks disappear, the commit itself and the commit log - message is not shown, unless '-m' is specified. + message is not shown, just like any other "empty diff" cases. Limiting Output -- 2.26.2