From 48fd2f66b082013aeca9f5044bf8bf7f668ee168 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Mar 2007 02:02:30 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0.5-424-g7976c --- RelNotes-1.5.0.5.txt | 28 ++++++++++++++++++++++++++++ diff-options.txt | 5 +++++ git-diff-files.html | 12 +++++++++++- git-diff-index.html | 12 +++++++++++- git-diff-tree.html | 12 +++++++++++- git-diff.html | 12 +++++++++++- git-format-patch.html | 12 +++++++++++- git.html | 2 +- git.txt | 4 +++- 9 files changed, 92 insertions(+), 7 deletions(-) create mode 100644 RelNotes-1.5.0.5.txt diff --git a/RelNotes-1.5.0.5.txt b/RelNotes-1.5.0.5.txt new file mode 100644 index 000000000..aa86149d4 --- /dev/null +++ b/RelNotes-1.5.0.5.txt @@ -0,0 +1,28 @@ +GIT v1.5.0.5 Release Notes +========================== + +Fixes since v1.5.0.3 +-------------------- + +* Bugfixes + + - git-merge (hence git-pull) did not refuse fast-forwarding + when the working tree had local changes that would have + conflicted with it. + + - git.el does not add duplicate sign-off lines. + + - git-commit shows the full stat of the resulting commit, not + just about the files in the current directory, when run from + a subdirectory. + + - "git-checkout -m '@{8 hours ago}'" had a funny failure from + eval; fixed. + + - git-gui updates. + +* Documentation updates + +* User manual updates + + diff --git a/diff-options.txt b/diff-options.txt index d8696b7b3..77a3f78dd 100644 --- a/diff-options.txt +++ b/diff-options.txt @@ -159,5 +159,10 @@ -w:: Shorthand for "--ignore-all-space". +--exit-code:: + Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. + For more detailed explanation on these common options, see also link:diffcore.html[diffcore documentation]. diff --git a/git-diff-files.html b/git-diff-files.html index d6b3575a3..93df142be 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -635,6 +635,16 @@ same as "git-diff-index" and "git-diff-tree".

Shorthand for "--ignore-all-space".

+
+--exit-code +
+
+

+ Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1011,7 +1021,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index 0e564002d..9e809f42e 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -636,6 +636,16 @@ entries in the index are compared.

Shorthand for "--ignore-all-space".

+
+--exit-code +
+
+

+ Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1093,7 +1103,7 @@ always have the special all-zero sha1. diff --git a/git-diff-tree.html b/git-diff-tree.html index 575c0b424..6226c358f 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -638,6 +638,16 @@ git-diff-tree(1) Manual Page Shorthand for "--ignore-all-space".

+
+--exit-code +
+
+

+ Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -1445,7 +1455,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff.html b/git-diff.html index 8390e23b5..ca2550cef 100644 --- a/git-diff.html +++ b/git-diff.html @@ -690,6 +690,16 @@ any <tree-ish>.

Shorthand for "--ignore-all-space".

+
+--exit-code +
+
+

+ Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -842,7 +852,7 @@ output diff in reverse. diff --git a/git-format-patch.html b/git-format-patch.html index 65d18d047..d24bf3d8b 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -657,6 +657,16 @@ reference.

Shorthand for "--ignore-all-space".

+
+--exit-code +
+
+

+ Make the program exit with codes similar to diff(1). + That is, it exits with 1 if there were differences and + 0 means no differences. +

+

For more detailed explanation on these common options, see also diffcore documentation.

@@ -859,7 +869,7 @@ git-format-patch -3 diff --git a/git.html b/git.html index 16589d371..ca8b5177d 100644 --- a/git.html +++ b/git.html @@ -2317,7 +2317,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index e875e8318..31397dc53 100644 --- a/git.txt +++ b/git.txt @@ -35,7 +35,9 @@ ifdef::stalenotes[] You are reading the documentation for the latest version of git. Documentation for older releases are available here: -* link:v1.5.0.3/git.html[documentation for release 1.5.0.3] +* link:v1.5.0.5/git.html[documentation for release 1.5.0.5] + +* link:v1.5.0.5/RelNotes-1.5.0.5.txt[release notes for 1.5.0.5] * link:v1.5.0.3/RelNotes-1.5.0.3.txt[release notes for 1.5.0.3] -- 2.26.2