diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-18 22:08:41 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-18 22:08:41 -0700 |
commit | 2c57ebc22329e11fc4843f62fe464a4e0c212176 (patch) | |
tree | d9618fa4497ae60fe5503bed0d673704eb2e1b48 /Documentation | |
parent | Merge branch 'lt/dirwalk' into next (diff) | |
parent | Documentation/Makefile: create tarballs for the man pages and html files (diff) | |
download | tgif-2c57ebc22329e11fc4843f62fe464a4e0c212176.tar.xz |
Merge branch 'ts/doctar' into next
* ts/doctar:
Documentation/Makefile: create tarballs for the man pages and html files
SubmittingPatches: The download location of External Editor has moved
Make git-check-format-ref a builtin.
Make "git rev-list" be a builtin
builtin-diff: do not say files are renamed when blob and file are given
Provide a way to flush git-diff-tree's output
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/SubmittingPatches | 4 | ||||
-rwxr-xr-x | Documentation/install-webdoc.sh | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 318b04fdeb..8601949e80 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -266,8 +266,8 @@ This recipe appears to work with the current [*1*] Thunderbird from Suse. The following Thunderbird extensions are needed: AboutConfig 0.5 http://aboutconfig.mozdev.org/ - External Editor 0.5.4 - http://extensionroom.mozdev.org/more-info/exteditor + External Editor 0.7.2 + http://globs.org/articles.php?lng=en&pg=8 1) Prepare the patch as a text file using your method of choice. diff --git a/Documentation/install-webdoc.sh b/Documentation/install-webdoc.sh index 50638c78d5..60211a5058 100755 --- a/Documentation/install-webdoc.sh +++ b/Documentation/install-webdoc.sh @@ -4,12 +4,16 @@ T="$1" for h in *.html *.txt howto/*.txt howto/*.html do - diff -u -I'Last updated [0-9][0-9]-[A-Z][a-z][a-z]-' "$T/$h" "$h" || { + if test -f "$T/$h" && + diff -u -I'Last updated [0-9][0-9]-[A-Z][a-z][a-z]-' "$T/$h" "$h" + then + :; # up to date + else echo >&2 "# install $h $T/$h" rm -f "$T/$h" mkdir -p `dirname "$T/$h"` cp "$h" "$T/$h" - } + fi done strip_leading=`echo "$T/" | sed -e 's|.|.|g'` for th in "$T"/*.html "$T"/*.txt "$T"/howto/*.txt "$T"/howto/*.html |