Permalink
Browse files

Autogenerated HTML docs for v1.7.7-138-g7f41b6

  • Loading branch information...
gitster committed Oct 5, 2011
1 parent c94277e commit 8fb66e5074d5cdeeb08e304be977374501a0787d
View
@@ -0,0 +1,107 @@
+Git v1.7.8 Release Notes (draft)
+================================
+
+Updates since v1.7.7
+--------------------
+
+ * The build procedure has been taught to take advantage of computed
+ dependency automatically when the complier supports it.
+
+ * The date parser now accepts timezone designators that lack minutes
+ part and also has a colon between "hh:mm".
+
+ * "git am" learned how to read from patches generated by Hg.
+
+ * "git branch" learned an explicit --list option to ask for branches
+ listed, optionally with a glob matching pattern to limit its output.
+
+ * "git check-attr" learned "--cached" option to look at .gitattributes
+ files from the index, not from the working tree.
+
+ * Variants of "git cherry-pick" and "git revert" that take multiple
+ commits learned to "--continue".
+
+ * "git fetch" learned to honor transfer.fsckobjects configuration to
+ validate the objects that were received from the other end, just like
+ "git receive-pack" (the receiving end of "git push") does.
+
+ * "git fetch" makes sure that the set of objects it received from the
+ other end actually completes the history before updating the refs.
+ "git receive-pack" (the receiving end of "git push") learned to do the
+ same.
+
+ * "git for-each-ref" learned "%(contents:subject)", "%(contents:body)"
+ and "%(contents:signature)". The last one is useful for signed tags.
+
+ * "git ls-remote" learned to respond to "-h"(elp) requests.
+
+ * "git send-email" learned to respond to "-h"(elp) requests.
+
+ * "git stash" learned "--include-untracked" option to stash away
+ untracked/ignored cruft from the working tree.
+
+ * "mediawiki" remote helper can interact with (surprise!) MediaWiki
+ with "git fetch" & "git push".
+
+ * "gitweb" leaked unescaped control characters from syntax hiliter
+ outputs.
+
+
+Fixes since v1.7.7
+------------------
+
+Unless otherwise noted, all fixes in the 1.7.7.X maintenance track are
+included in this release.
+
+ * "git diff $tree $path" used to apply the pathspec at the output stage,
+ reading the whole tree, wasting resources.
+ (merge 2f88c1970 jc/diff-index-unpack later to maint).
+
+ * The code to check for updated submodules during a "git fetch" of the
+ superproject had an unnecessary quadratic loop.
+ (merge 6859de45 jk/maint-fetch-submodule-check-fix later to maint).
+
+ * "git fetch" from a large bundle did not enable the progress output.
+ (merge be042aff jc/maint-bundle-too-quiet later to maint).
+
+ * When "git fsck --lost-and-found" found that an empty blob object in the
+ object store is unreachable, it incorrectly reported an error after
+ writing the lost blob out successfully.
+ (merge eb726f2d jc/maint-fsck-fwrite-size-check later to maint).
+
+ * "git filter-branch" did not refresh the index before checking that the
+ working tree was clean.
+ (merge 5347a50f jk/filter-branch-require-clean-work-tree later to maint).
+
+ * "git grep $tree" when run with multiple threads had an unsafe access to
+ the object database that should have been protected with mutex.
+ (merge 8cb5775b2 nm/grep-object-sha1-lock later to maint).
+
+ * The "--ancestry-path" option to "git log" and friends misbehaved in a
+ history with complex criss-cross merges and showed an uninteresting
+ side history as well.
+ (merge c05b988a6 bk/ancestry-path later to maint).
+
+ * "git merge" did not understand ":/<pattern>" as a way to name a commit.
+
+ * Tests with --valgrind failed to find "mergetool" scriptlets.
+ (merge ee0d7bf92 tr/mergetool-valgrind later to maint).
+
+ * "git patch-id" miscomputed the patch-id in a patch that has a line longer
+ than 1kB.
+ (merge b9ab810b ms/patch-id-with-overlong-line later to maint).
+
+ * When an "exec" insn failed after modifying the index and/or the working
+ tree during "rebase -i", we now check and warn that the changes need to
+ be cleaned up.
+ (merge 1686519a mm/rebase-i-exec-edit later to maint).
+
+---
+it=master
+exec >/var/tmp/1
+O=v1.7.7
+O=v1.7.7-137-g2e49dab
+echo O=$(git describe --always $it)
+git log --first-parent --oneline --reverse ^$O $it
+echo
+git shortlog --no-merges ^$O $it
View
@@ -147,7 +147,7 @@ advice.*::
core.fileMode::
If false, the executable bit differences between the index and
- the working copy are ignored; useful on broken filesystems like FAT.
+ the working tree are ignored; useful on broken filesystems like FAT.
See linkgit:git-update-index[1].
+
The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
@@ -179,7 +179,7 @@ is created.
core.trustctime::
If false, the ctime differences between the index and the
- working copy are ignored; useful when the inode change time
+ working tree are ignored; useful when the inode change time
is regularly modified by something outside Git (file system
crawlers and some backup systems).
See linkgit:git-update-index[1]. True by default.
@@ -292,7 +292,7 @@ core.ignoreStat::
If true, commands which modify both the working tree and the index
will mark the updated paths with the "assume unchanged" bit in the
index. These marked files are then assumed to stay unchanged in the
- working copy, until you mark them otherwise manually - Git will not
+ working tree, until you mark them otherwise manually - Git will not
detect the file changes by lstat() calls. This is useful on systems
where those are very slow, such as Microsoft Windows.
See linkgit:git-update-index[1].
@@ -857,6 +857,13 @@ fetch.recurseSubmodules::
when its superproject retrieves a commit that updates the submodule's
reference.
+fetch.fsckObjects::
+ If it is set to true, git-fetch-pack will check all fetched
+ objects. It will abort in the case of a malformed object or a
+ broken link. The result of an abort are only dangling objects.
+ Defaults to false. If not set, the value of `transfer.fsckObjects`
+ is used instead.
+
fetch.unpackLimit::
If the number of objects fetched over the git native
transfer is below this
@@ -1453,7 +1460,8 @@ notes.rewriteRef::
You may also specify this configuration several times.
+
Does not have a default value; you must configure this variable to
-enable note rewriting.
+enable note rewriting. Set it to `refs/notes/commits` to enable
+rewriting for the default commit notes.
+
This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
environment variable, which must be a colon separated list of refs or
@@ -1595,7 +1603,8 @@ receive.fsckObjects::
If it is set to true, git-receive-pack will check all received
objects. It will abort in the case of a malformed object or a
broken link. The result of an abort are only dangling objects.
- Defaults to false.
+ Defaults to false. If not set, the value of `transfer.fsckObjects`
+ is used instead.
receive.unpackLimit::
If the number of objects received in a push is below this
@@ -1830,6 +1839,11 @@ tar.umask::
archiving user's umask will be used instead. See umask(2) and
linkgit:git-archive[1].
+transfer.fsckObjects::
+ When `fetch.fsckObjects` or `receive.fsckObjects` are
+ not set, the value of this variable is used instead.
+ Defaults to false.
+
transfer.unpackLimit::
When `fetch.unpackLimit` or `receive.unpackLimit` are
not set, the value of this variable is used instead.
View
@@ -584,8 +584,8 @@ <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<div class="verseblock-content"><em>git branch</em> [--color[=&lt;when&gt;] | --no-color] [-r | -a]
- [-v [--abbrev=&lt;length&gt; | --no-abbrev]]
- [(--merged | --no-merged | --contains) [&lt;commit&gt;]]
+ [--list] [-v [--abbrev=&lt;length&gt; | --no-abbrev]]
+ [(--merged | --no-merged | --contains) [&lt;commit&gt;]] [&lt;pattern&gt;&#8230;]
<em>git branch</em> [--set-upstream | --track | --no-track] [-l] [-f] &lt;branchname&gt; [&lt;start-point&gt;]
<em>git branch</em> (-m | -M) [&lt;oldbranch&gt;] &lt;newbranch&gt;
<em>git branch</em> (-d | -D) [-r] &lt;branchname&gt;&#8230;</div>
@@ -596,7 +596,11 @@ <h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p>With no arguments, existing branches are listed and the current branch will
be highlighted with an asterisk. Option <tt>-r</tt> causes the remote-tracking
-branches to be listed, and option <tt>-a</tt> shows both.</p></div>
+branches to be listed, and option <tt>-a</tt> shows both. This list mode is also
+activated by the <tt>--list</tt> option (see below).
+&lt;pattern&gt; restricts the output to matching branches, the pattern is a shell
+wildcard (i.e., matched using fnmatch(3))
+Multiple patterns may be given; if any of them matches, the tag is shown.</p></div>
<div class="paragraph"><p>With <tt>--contains</tt>, shows only the branches that contain the named commit
(in other words, the branches whose tip commits are descendants of the
named commit). With <tt>--merged</tt>, only branches merged into the named
@@ -635,6 +639,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-d
</dt>
+<dt class="hdlist1">
+--delete
+</dt>
<dd>
<p>
Delete a branch. The branch must be fully merged in its
@@ -653,6 +660,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-l
</dt>
+<dt class="hdlist1">
+--create-reflog
+</dt>
<dd>
<p>
Create the branch&#8217;s reflog. This activates recording of
@@ -677,6 +687,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-m
</dt>
+<dt class="hdlist1">
+--move
+</dt>
<dd>
<p>
Move/rename a branch and the corresponding reflog.
@@ -713,6 +726,9 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-r
</dt>
+<dt class="hdlist1">
+--remotes
+</dt>
<dd>
<p>
List or delete (if used with -d) the remote-tracking branches.
@@ -721,20 +737,33 @@ <h2 id="_options">OPTIONS</h2>
<dt class="hdlist1">
-a
</dt>
+<dt class="hdlist1">
+--all
+</dt>
<dd>
<p>
List both remote-tracking branches and local branches.
</p>
</dd>
<dt class="hdlist1">
+--list
+</dt>
+<dd>
+<p>
+ Activate the list mode. <tt>git branch &lt;pattern&gt;</tt> would try to create a branch,
+ use <tt>git branch --list &lt;pattern&gt;</tt> to list matching branches.
+</p>
+</dd>
+<dt class="hdlist1">
-v
</dt>
<dt class="hdlist1">
--verbose
</dt>
<dd>
<p>
- Show sha1 and commit subject line for each head, along with
+ When in list mode,
+ show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
the name of the upstream branch, as well.
</p>
@@ -961,7 +990,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-09-21 23:01:14 PDT
+Last updated 2011-10-05 13:59:16 PDT
</div>
</div>
</body>
View
@@ -9,8 +9,8 @@ SYNOPSIS
--------
[verse]
'git branch' [--color[=<when>] | --no-color] [-r | -a]
- [-v [--abbrev=<length> | --no-abbrev]]
- [(--merged | --no-merged | --contains) [<commit>]]
+ [--list] [-v [--abbrev=<length> | --no-abbrev]]
+ [(--merged | --no-merged | --contains) [<commit>]] [<pattern>...]
'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (-m | -M) [<oldbranch>] <newbranch>
'git branch' (-d | -D) [-r] <branchname>...
@@ -20,7 +20,11 @@ DESCRIPTION
With no arguments, existing branches are listed and the current branch will
be highlighted with an asterisk. Option `-r` causes the remote-tracking
-branches to be listed, and option `-a` shows both.
+branches to be listed, and option `-a` shows both. This list mode is also
+activated by the `--list` option (see below).
+<pattern> restricts the output to matching branches, the pattern is a shell
+wildcard (i.e., matched using fnmatch(3))
+Multiple patterns may be given; if any of them matches, the tag is shown.
With `--contains`, shows only the branches that contain the named commit
(in other words, the branches whose tip commits are descendants of the
@@ -64,6 +68,7 @@ way to clean up all obsolete remote-tracking branches.
OPTIONS
-------
-d::
+--delete::
Delete a branch. The branch must be fully merged in its
upstream branch, or in `HEAD` if no upstream was set with
`--track` or `--set-upstream`.
@@ -72,6 +77,7 @@ OPTIONS
Delete a branch irrespective of its merged status.
-l::
+--create-reflog::
Create the branch's reflog. This activates recording of
all changes made to the branch ref, enabling use of date
based sha1 expressions such as "<branchname>@\{yesterday}".
@@ -84,6 +90,7 @@ OPTIONS
already. Without `-f` 'git branch' refuses to change an existing branch.
-m::
+--move::
Move/rename a branch and the corresponding reflog.
-M::
@@ -100,14 +107,21 @@ OPTIONS
Same as `--color=never`.
-r::
+--remotes::
List or delete (if used with -d) the remote-tracking branches.
-a::
+--all::
List both remote-tracking branches and local branches.
+--list::
+ Activate the list mode. `git branch <pattern>` would try to create a branch,
+ use `git branch --list <pattern>` to list matching branches.
+
-v::
--verbose::
- Show sha1 and commit subject line for each head, along with
+ When in list mode,
+ show sha1 and commit subject line for each head, along with
relationship to upstream branch (if any). If given twice, print
the name of the upstream branch, as well.
View
@@ -607,6 +607,14 @@ <h2 id="_options">OPTIONS</h2>
</p>
</dd>
<dt class="hdlist1">
+--cached
+</dt>
+<dd>
+<p>
+ Consider <tt>.gitattributes</tt> in the index only, ignoring the working tree.
+</p>
+</dd>
+<dt class="hdlist1">
--stdin
</dt>
<dd>
@@ -764,7 +772,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-09-21 23:01:14 PDT
+Last updated 2011-10-05 13:59:16 PDT
</div>
</div>
</body>
View
@@ -24,6 +24,9 @@ OPTIONS
paths. If this option is used, then 'unspecified' attributes
will not be included in the output.
+--cached::
+ Consider `.gitattributes` in the index only, ignoring the working tree.
+
--stdin::
Read file names from stdin instead of from the command-line.
Oops, something went wrong.

0 comments on commit 8fb66e5

Please sign in to comment.