From 1c70883dc871f015b3f14945f7c310325ab4aba8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 2 Nov 2007 02:47:50 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.5-474-g3e4bb --- RelNotes-1.5.3.5.txt | 6 ------ git-clone.html | 8 ++++---- git-clone.txt | 6 +++--- git-filter-branch.html | 4 ++-- git-filter-branch.txt | 2 +- git-format-patch.html | 4 ++-- git-format-patch.txt | 2 +- git-mergetool.html | 9 +++++++-- git-mergetool.txt | 8 +++++++- git.html | 2 +- git.txt | 1 + 11 files changed, 29 insertions(+), 23 deletions(-) diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt index bf6a279ed..4e46d2c2a 100644 --- a/RelNotes-1.5.3.5.txt +++ b/RelNotes-1.5.3.5.txt @@ -92,9 +92,3 @@ Fixes since v1.5.3.4 * "git-rebase -interactive" did not handle its "--strategy" option properly. - --- -exec >/var/tmp/1 -O=v1.5.3.4-65-gf91333d -echo O=`git describe refs/heads/maint` -git shortlog --no-merges $O..refs/heads/maint diff --git a/git-clone.html b/git-clone.html index 24c834419..5305119f2 100644 --- a/git-clone.html +++ b/git-clone.html @@ -438,11 +438,11 @@ configuration variables.

Create a shallow clone with a history truncated to the - specified number of revs. A shallow repository has + specified number of revisions. A shallow repository has a number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you - want to only look at near the tip of a large project - with a long history, and would want to send in a fixes + are only interested in the recent history of a large project + with a long history, and would want to send in fixes as patches.

@@ -641,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus diff --git a/git-clone.txt b/git-clone.txt index 253f4f03c..cca14d6b5 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -111,11 +111,11 @@ OPTIONS --depth :: Create a 'shallow' clone with a history truncated to the - specified number of revs. A shallow repository has + specified number of revisions. A shallow repository has a number of limitations (you cannot clone or fetch from it, nor push from nor into it), but is adequate if you - want to only look at near the tip of a large project - with a long history, and would want to send in a fixes + are only interested in the recent history of a large project + with a long history, and would want to send in fixes as patches. :: diff --git a/git-filter-branch.html b/git-filter-branch.html index 11fcd821c..b601400b2 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html @@ -523,7 +523,7 @@ git filter-branch $graft-id..HEAD git commit-tree "$@"; fi' HEAD -

The function skip_commits is defined as follows:

+

The function skip_commit is defined as follows:

skip_commit()
@@ -593,7 +593,7 @@ and the git list <git@vger.kernel.org>
diff --git a/git-filter-branch.txt b/git-filter-branch.txt index ba9b4fbca..385ecc900 100644 --- a/git-filter-branch.txt +++ b/git-filter-branch.txt @@ -219,7 +219,7 @@ git filter-branch --commit-filter ' fi' HEAD ------------------------------------------------------------------------------ -The function 'skip_commits' is defined as follows: +The function 'skip_commit' is defined as follows: -------------------------- skip_commit() diff --git a/git-format-patch.html b/git-format-patch.html index db3610165..f757ca77a 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -932,7 +932,7 @@ git-format-patch --root origin

- Extract all commits which that leads to origin since the + Extract all commits that lead to origin since the inception of the project.

@@ -979,7 +979,7 @@ git-format-patch -3
diff --git a/git-format-patch.txt b/git-format-patch.txt index c9857a2d6..f0617efa0 100644 --- a/git-format-patch.txt +++ b/git-format-patch.txt @@ -168,7 +168,7 @@ git-format-patch origin:: is created in the current directory. git-format-patch \--root origin:: - Extract all commits which that leads to 'origin' since the + Extract all commits that lead to 'origin' since the inception of the project. git-format-patch -M -B origin:: diff --git a/git-mergetool.html b/git-mergetool.html index 80706dbca..d2a24b8e2 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -293,12 +293,17 @@ with merge conflicts.

Use the merge resolution program specified by <tool>. Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff

If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, git mergetool will pick a suitable default.

+

You can explicitly provide a full path to the tool by setting the +configuration variable mergetool.<tool>.path. For example, you +can configure the absolute path to kdiff3 by setting +mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool +is available in PATH.

@@ -316,7 +321,7 @@ will pick a suitable default.

diff --git a/git-mergetool.txt b/git-mergetool.txt index 6c32c6d18..a26c26016 100644 --- a/git-mergetool.txt +++ b/git-mergetool.txt @@ -25,12 +25,18 @@ OPTIONS -t or --tool=:: Use the merge resolution program specified by . Valid merge tools are: - kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff + kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge, and opendiff + If a merge resolution program is not specified, 'git mergetool' will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, 'git mergetool' will pick a suitable default. ++ +You can explicitly provide a full path to the tool by setting the +configuration variable mergetool..path. For example, you +can configure the absolute path to kdiff3 by setting +mergetool.kdiff3.path. Otherwise, 'git mergetool' assumes the tool +is available in PATH. Author ------ diff --git a/git.html b/git.html index 1a5c7ca94..009f91591 100644 --- a/git.html +++ b/git.html @@ -1949,7 +1949,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index c4d87ac20..6db7ae1ea 100644 --- a/git.txt +++ b/git.txt @@ -46,6 +46,7 @@ Documentation for older releases are available here: * link:v1.5.3/git.html[documentation for release 1.5.3] * release notes for + link:RelNotes-1.5.3.5.txt[1.5.3.5], link:RelNotes-1.5.3.4.txt[1.5.3.4], link:RelNotes-1.5.3.3.txt[1.5.3.3], link:RelNotes-1.5.3.2.txt[1.5.3.2], -- 2.26.2