From: Junio C Hamano Date: Thu, 26 Apr 2007 07:20:04 +0000 (+0000) Subject: Autogenerated HTML docs for v1.5.2-rc0-56-g6169a X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=45889b44baad996378f334ac546f4cf08147fff6;p=git.git Autogenerated HTML docs for v1.5.2-rc0-56-g6169a --- diff --git a/RelNotes-1.5.1.3.txt b/RelNotes-1.5.1.3.txt new file mode 100644 index 000000000..9a4b069cc --- /dev/null +++ b/RelNotes-1.5.1.3.txt @@ -0,0 +1,38 @@ +GIT v1.5.1.3 Release Notes (draft) +========================== + +Fixes since v1.5.1.2 +-------------------- + +* Bugfixes + + - git-add tried to optimize by finding common leading + directories across its arguments but botched, causing very + confused behaviour. + + - unofficial rpm.spec file shipped with git was letting + ETC_GITCONFIG set to /usr/etc/gitconfig. Tweak the official + Makefile to make it harder for distro people to make the + same mistake, by setting the variable to /etc/gitconfig if + prefix is set to /usr. + + - git-svn inconsistently stripped away username from the URL + only when svnsync_props was in use. + + - git-send-email was not quoting recipient names that have + period '.' in them. Also it did not allow overriding + envelope sender, which made it impossible to send patches to + certain subscriber-only lists. + + - built-in write_tree() routine had a sequence that renamed a + file that is still open, which some systems did not like. + + - when memory is very tight, sliding mmap code to read + packfiles incorrectly closed the fd that was still being + used to read the pack. + +--- +exec >/var/tmp/1 +O=v1.5.1.2-23-gbf7af11 +echo O=`git describe refs/heads/maint` +git shortlog --no-merges $O..refs/heads/maint diff --git a/core-tutorial.html b/core-tutorial.html index 7226c559b..7daeca47a 100644 --- a/core-tutorial.html +++ b/core-tutorial.html @@ -583,10 +583,9 @@ argument to git-commit-tree.

git-commit-tree normally takes several arguments — it wants to know what the parent of a commit was, but since this is the first commit ever in this new repository, and it has no parents, we only need to pass in -the object name of the tree. However, git-commit-tree -also wants to get a commit message -on its standard input, and it will write out the resulting object name for the -commit to its standard output.

+the object name of the tree. However, git-commit-tree also wants to get a +commit message on its standard input, and it will write out the resulting +object name for the commit to its standard output.

And this is where we create the .git/refs/heads/master file which is pointed at by HEAD. This file is supposed to contain the reference to the top-of-tree of the master branch, and since @@ -1528,7 +1527,7 @@ differences since stage 2 (i.e. your version).

So, we can use somebody else's work from a remote repository, but how can you prepare a repository to let other people pull from it?

-

Your do your real work in your working tree that has your +

You do your real work in your working tree that has your primary repository hanging under it as its .git subdirectory. You could make that repository accessible remotely and ask people to pull from it, but in practice that is not the way @@ -1969,7 +1968,7 @@ to follow, not easier.

diff --git a/core-tutorial.txt b/core-tutorial.txt index 97cdb90cb..6b9b9ad7d 100644 --- a/core-tutorial.txt +++ b/core-tutorial.txt @@ -319,10 +319,9 @@ argument to `git-commit-tree`. `git-commit-tree` normally takes several arguments -- it wants to know what the 'parent' of a commit was, but since this is the first commit ever in this new repository, and it has no parents, we only need to pass in -the object name of the tree. However, `git-commit-tree` -also wants to get a commit message -on its standard input, and it will write out the resulting object name for the -commit to its standard output. +the object name of the tree. However, `git-commit-tree` also wants to get a +commit message on its standard input, and it will write out the resulting +object name for the commit to its standard output. And this is where we create the `.git/refs/heads/master` file which is pointed at by `HEAD`. This file is supposed to contain @@ -1304,7 +1303,7 @@ So, we can use somebody else's work from a remote repository, but how can *you* prepare a repository to let other people pull from it? -Your do your real work in your working tree that has your +You do your real work in your working tree that has your primary repository hanging under it as its `.git` subdirectory. You *could* make that repository accessible remotely and ask people to pull from it, but in practice that is not the way diff --git a/git-rev-list.html b/git-rev-list.html index 68151655d..bd5c2cd13 100644 --- a/git-rev-list.html +++ b/git-rev-list.html @@ -289,6 +289,7 @@ git-rev-list(1) Manual Page [ --cherry-pick ] [ --encoding[=<encoding>] ] [ --(author|committer|grep)=<pattern> ] + [ --date={local|relative|default} ] [ [--objects | --objects-edge] [ --unpacked ] ] [ --pretty | --header ] [ --bisect ] @@ -639,10 +640,22 @@ The title was >>t4119: test autocomputing -p<n> for traditional diff

- Show dates relative to the current time, e.g. "2 hours ago". + Synonym for --date=relative. +

+
+
+--date={relative,local,default} +
+
+

Only takes effect for dates shown in human-readable format, such as when using "--pretty".

+

--date=relative shows dates relative to the current time, +e.g. "2 hours ago".

+

--date=local shows timestamps in user's local timezone.

+

--date=default shows timestamps in the original timezone +(either committer's or author's).

--header @@ -1035,7 +1048,7 @@ and the git-list <git@vger.kernel.org>.

diff --git a/git-rev-list.txt b/git-rev-list.txt index 77e068b15..1b12b4f2a 100644 --- a/git-rev-list.txt +++ b/git-rev-list.txt @@ -25,6 +25,7 @@ SYNOPSIS [ \--cherry-pick ] [ \--encoding[=] ] [ \--(author|committer|grep)= ] + [ \--date={local|relative|default} ] [ [\--objects | \--objects-edge] [ \--unpacked ] ] [ \--pretty | \--header ] [ \--bisect ] @@ -90,9 +91,20 @@ include::pretty-formats.txt[] --relative-date:: - Show dates relative to the current time, e.g. "2 hours ago". + Synonym for `--date=relative`. + +--date={relative,local,default}:: + Only takes effect for dates shown in human-readable format, such as when using "--pretty". ++ +`--date=relative` shows dates relative to the current time, +e.g. "2 hours ago". ++ +`--date=local` shows timestamps in user's local timezone. ++ +`--date=default` shows timestamps in the original timezone +(either committer's or author's). --header:: diff --git a/git-send-email.html b/git-send-email.html index 51417eee4..b5f1b145c 100644 --- a/git-send-email.html +++ b/git-send-email.html @@ -400,6 +400,25 @@ enabled interface to provide the necessary information.

+--dry-run +
+
+

+ Do everything except actually send the emails. +

+
+
+--envelope-sender +
+
+

+ Specify the envelope sender used to send the emails. + This is useful if your default address is not the address that is + subscribed to a list. If you use the sendmail binary, you must have + suitable privileges for the -f parameter. +

+
+
--to
@@ -476,7 +495,7 @@ send_lots_of_email.pl by Greg Kroah-Hartman.

diff --git a/git-send-email.txt b/git-send-email.txt index 682313e95..795db873f 100644 --- a/git-send-email.txt +++ b/git-send-email.txt @@ -85,6 +85,15 @@ The --cc option must be repeated for each user you want on the cc list. Do not add the From: address to the cc: list, if it shows up in a From: line. +--dry-run:: + Do everything except actually send the emails. + +--envelope-sender:: + Specify the envelope sender used to send the emails. + This is useful if your default address is not the address that is + subscribed to a list. If you use the sendmail binary, you must have + suitable privileges for the -f parameter. + --to:: Specify the primary recipient of the emails generated. Generally, this will be the upstream maintainer of the