From: Junio C Hamano Date: Thu, 10 May 2007 23:25:08 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-rc3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea5dae6fa1fe0cb17c2406be7ab2264b96933f80;p=git.git Autogenerated HTML docs for v1.5.2-rc3 --- diff --git a/RelNotes-1.5.2.txt b/RelNotes-1.5.2.txt index c14f3da7a..42e7fa5be 100644 --- a/RelNotes-1.5.2.txt +++ b/RelNotes-1.5.2.txt @@ -44,6 +44,11 @@ Updates since v1.5.1 * Comes with an updated git-gui 0.7.0 +* Updated gitweb: + + - can show combined diff for merges; + - uses font size of user's preference, not hardcoded in pixels; + * New commands and options. - "git bisect start" can optionally take a single bad commit and @@ -141,6 +146,8 @@ Updates since v1.5.1 - Optimized "git-add $path" in a large directory, most of whose contents are ignored. + - Optimized "git-diff-tree" for reduced memory footprint. + - The recursive merge strategy updated a worktree file that was changed identically in two branches, when one of them renamed it. We do not do that when there is no rename, so @@ -187,6 +194,6 @@ this release, unless otherwise noted. -- exec >/var/tmp/1 -O=v1.5.2-rc2-45-g618e613 +O=v1.5.2-rc2-91-g616e40b echo O=`git describe refs/heads/master` git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint diff --git a/git-fast-import.html b/git-fast-import.html index 6d74817eb..f92cf9aa2 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -891,8 +891,7 @@ lightweight (non-annotated) tags see the reset command below.

        'tag' SP <name> LF
         'from' SP <committish> LF
         'tagger' SP <name> SP LT <email> GT SP <when> LF
-        data
-        LF
+ data

where <name> is the name of the tag to create.

Tag names are automatically prefixed with refs/tags/ when stored @@ -1204,7 +1203,7 @@ memory footprint (less than 2.7 MiB per active branch).

diff --git a/git-fast-import.txt b/git-fast-import.txt index eaba6fd4c..8d06775a6 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -548,7 +548,6 @@ lightweight (non-annotated) tags see the `reset` command below. 'from' SP LF 'tagger' SP SP LT GT SP LF data - LF .... where `` is the name of the tag to create. diff --git a/git-log.html b/git-log.html index 55c0ac40a..be935423f 100644 --- a/git-log.html +++ b/git-log.html @@ -629,6 +629,14 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

+--decorate +
+
+

+ Print out the ref names of any commits that are shown. +

+
+
<paths>…
@@ -771,7 +779,7 @@ reversible operation.

diff --git a/git-log.txt b/git-log.txt index 49bb539de..dd06527a1 100644 --- a/git-log.txt +++ b/git-log.txt @@ -51,6 +51,9 @@ include::pretty-formats.txt[] a record about how the tip of a reference was changed. See also gitlink:git-reflog[1]. +--decorate:: + Print out the ref names of any commits that are shown. + ...:: Show only commits that affect the specified paths. diff --git a/git-rev-parse.html b/git-rev-parse.html index 64f468941..20bbf50bd 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html @@ -675,7 +675,7 @@ reachable from r1 from the set of commits reachable from

A similar notation "r1...r2" is called symmetric difference of r1 and r2 and is defined as "r1 r2 --not $(git-merge-base --all r1 r2)". -It it the set of commits that are reachable from either one of +It is the set of commits that are reachable from either one of r1 or r2 but not from both.

Two other shorthands for naming a set that is formed by a commit and its parent commits exists. r1^@ notation means all @@ -709,7 +709,7 @@ Junio C Hamano <junkio@cox.net>

diff --git a/git-rev-parse.txt b/git-rev-parse.txt index a8bf6561e..7757abe62 100644 --- a/git-rev-parse.txt +++ b/git-rev-parse.txt @@ -255,7 +255,7 @@ reachable from `r1` from the set of commits reachable from A similar notation "`r1\...r2`" is called symmetric difference of `r1` and `r2` and is defined as "`r1 r2 --not $(git-merge-base --all r1 r2)`". -It it the set of commits that are reachable from either one of +It is the set of commits that are reachable from either one of `r1` or `r2` but not from both. Two other shorthands for naming a set that is formed by a commit