Permalink
Browse files

Autogenerated HTML docs for v1.7.12-395-g6b149

  • Loading branch information...
1 parent eccdd4a commit 693e70961ac5a79a46303795f3ca6a0bfd62f375 @gitster committed Sep 12, 2012
View
@@ -4,59 +4,81 @@ Git v1.7.11.6 Release Notes
Fixes since v1.7.11.5
---------------------
-This consists primarily of documentation updates and low-impact code
-clarification and bugfixes.
-
- - "ciabot" script (in contrib/) has been updated with extensive
+ * "ciabot" script (in contrib/) has been updated with extensive
documentation.
- - The "--rebase" option to "git pull" can be abbreviated to "-r",
- but we didn't document it.
+ * "git foo" errored out with "Not a directory" when the user had a
+ non-directory on $PATH, and worse yet it masked an alias "foo" from
+ running.
- - It was generally understood that "--long-option"s to many of our
- subcommands can be abbreviated to the unique prefix, but it was not
- easy to find it described for new readers of the documentation set.
+ * When the user exports a non-default IFS without HT, scripts that
+ rely on being able to parse "ls-files -s | while read a b c..."
+ started to fail. Protect them from such a misconfiguration.
- - The "--topo-order", "--date-order" (and the lack of either means
- the default order) options to "rev-list" and "log" family of
- commands were poorly described in the documentation.
+ * When the user gives an argument that can be taken as both a
+ revision name and a pathname without disambiguating with "--", we
+ used to give a help message "Use '--' to separate". The message
+ has been clarified to show where that '--' goes on the command
+ line.
+
+ * Documentation for the configuration file format had a confusing
+ example.
- - Older parts of the documentation described as if having a regular
+ * Older parts of the documentation described as if having a regular
file in .git/refs/ hierarchy were the only way to have branches and
tags, which is not true for quite some time.
- - A utility shell function test_seq has been added as a replacement
- for the 'seq' utility found on some platforms.
+ * It was generally understood that "--long-option"s to many of our
+ subcommands can be abbreviated to the unique prefix, but it was not
+ easy to find it described for new readers of the documentation set.
- - Fallback 'getpass' implementation made unportable use of stdio API.
+ * The "--topo-order", "--date-order" (and the lack of either means
+ the default order) options to "rev-list" and "log" family of
+ commands were poorly described in the documentation.
- - "git commit --amend" let the user edit the log message and then
+ * "git commit --amend" let the user edit the log message and then
died when the human-readable committer name was given
insufficiently by getpwent(3).
- - The reflog entries left by "git rebase" and "git rebase -i" were
- inconsistent (the interactive one gave an abbreviated object name).
+ * The exit status code from "git config" was way overspecified while
+ being incorrect. The implementation has been updated to give the
+ documented status for a case that was documented, and introduce a
+ new code for "all other errors".
- - When the user exports a non-default IFS without HT, scripts that
- rely on being able to parse "ls-files -s | while read a b c..."
- started to fail. Protect them from such a misconfiguration.
+ * The output from "git diff -B" for a file that ends with an
+ incomplete line did not put "\ No newline..." on a line of its own.
+
+ * "git diff" had a confusion between taking data from a path in the
+ working tree and taking data from an object that happens to have
+ name 0{40} recorded in a tree.
- - When "git push" triggered the automatic gc on the receiving end, a
+ * The "--rebase" option to "git pull" can be abbreviated to "-r",
+ but we didn't document it.
+
+ * When "git push" triggered the automatic gc on the receiving end, a
message from "git prune" that said it was removing cruft leaked to
the standard output, breaking the communication protocol.
- - "git diff" had a confusion between taking data from a path in the
- working tree and taking data from an object that happens to have
- name 0{40} recorded in a tree.
+ * The reflog entries left by "git rebase" and "git rebase -i" were
+ inconsistent (the interactive one gave an abbreviated object name).
- - "git send-email" did not unquote encoded words that appear on the
+ * "git send-email" did not unquote encoded words that appear on the
header correctly, and lost "_" from strings.
- - When the user gives an argument that can be taken as both a
- revision name and a pathname without disambiguating with "--", we
- used to give a help message "Use '--' to separate". The message
- has been clarified to show where that '--' goes on the command
- line.
+ * "git stash apply/pop" did not trigger "rerere" upon conflicts
+ unlike other mergy operations.
+
+ * "git submodule <cmd> path" did not error out when the path to the
+ submodule was misspelt.
- - "gitweb" when used with PATH_INFO failed to notice directories with
+ * "git submodule update -f" did not update paths in the working tree
+ that has local changes.
+ (merge 01d4721 sz/submodule-force-update later to maint).
+
+ * "gitweb" when used with PATH_INFO failed to notice directories with
SP (and other characters that need URL-style quoting) in them.
+
+ * Fallback 'getpass' implementation made unportable use of stdio API.
+
+ * A utility shell function test_seq has been added as a replacement
+ for the 'seq' utility found on some platforms.
View
@@ -14,6 +14,11 @@ Fixes since v1.7.12
subcommands can be abbreviated to the unique prefix, but it was not
easy to find it described for new readers of the documentation set.
+ * The synopsis said "checkout [-B branch]" to make it clear the
+ branch name is a parameter to the option, but the heading for the
+ option description was "-B::", not "-B branch::", making the
+ documentation misleading.
+
* The "--topo-order", "--date-order" (and the lack of either means
the default order) options to "rev-list" and "log" family of
commands were poorly described in the documentation.
@@ -25,15 +30,49 @@ Fixes since v1.7.12
* A utility shell function test_seq has been added as a replacement
for the 'seq' utility found on some platforms.
+ * Compatibility wrapper to learn the maximum number of file
+ descriptors we can open around sysconf(_SC_OPEN_MAX) and
+ getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
+
+ * We used curl_easy_strerror() without checking version of cURL,
+ breaking the build for versions before curl 7.12.0.
+
+ * Code to work around MacOS X UTF-8 gotcha has been cleaned up.
+
* Fallback 'getpass' implementation made unportable use of stdio API.
+ * "git apply -p0" did not parse pathnames on "diff --git" line
+ correctly. This caused patches that had pathnames in no other
+ places to be mistakenly rejected (most notably, binary patch that
+ does not rename nor change mode). Textual patches, renames or mode
+ changes have preimage and postimage pathnames in different places
+ in a form that can be parsed unambiguously and did not suffer from
+ this problem.
+
* "git commit --amend" let the user edit the log message and then
died when the human-readable committer name was given
insufficiently by getpwent(3).
+ * Some capabilities were asked by fetch-pack even when upload-pack
+ did not advertise that they are available. fetch-pack has been
+ fixed not to do so.
+
+ * "git for-each-ref" did not currectly support more than one --sort
+ option.
+
+ * "git log .." errored out saying it is both rev range and a path
+ when there is no disambiguating "--" is on the command line.
+ Update the command line parser to interpret ".." as a path in such
+ a case.
+
* "git prune" without "-v" used to warn about leftover temporary
files (which is an indication of an earlier aborted operation).
+ * Pushing to smart HTTP server with recent Git fails without having
+ the username in the URL to force authentication, if the server is
+ configured to allow GET anonymously, while requiring authentication
+ for POST.
+
* The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).
View
@@ -51,33 +51,47 @@ UI, Workflows & Features
* "git grep" learned to use a non-standard pattern type by default if
a configuration variable tells it to.
+ * "git merge-base" learned "--is-ancestor A B" option to tell if A is
+ an ancestor of B. The result is indicated by its exit status code.
+
+
Foreign Interface
* "git svn" has been updated to work with SVN 1.7.
+
Performance, Internal Implementation, etc. (please report possible regressions)
+ * Git ships with a fall-back regexp implementation for platforms with
+ buggy regexp library, but it was easy for people to keep using their
+ platform regexp. A new test has been added to check this.
+
* The "check-docs" build target has been updated and greatly
simplified.
* The documentation in the TeXinfo format was using indented output
for materials meant to be examples that are better typeset in
monospace.
- * Compatibility wrapper to learn the maximum number of file
- descriptors we can open around sysconf(_SC_OPEN_MAX) and
- getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
-
* Compatibility wrapper around some mkdir(2) implementations that
reject parameter with trailing slash has been introduced.
+ * Compatibility wrapper for systems that lack usable setitimer() has
+ been added.
+
+ * Many internal uses of "git merge-base" equivalent were only to see
+ if one commit fast-forwards to the other, which did not need the
+ full set of merge bases to be computed. They have been updated to
+ use less expensive checks.
+
* The heuristics to detect and silently convert latin1 to utf8 when
we were told to use utf-8 in the log message has been transplanted
from "mailinfo" to "commit" and "commit-tree".
* Messages given by "git <subcommand> -h" from many subcommands have
been marked for translation.
+
Also contains minor documentation updates and code clean-ups.
@@ -88,6 +102,22 @@ Unless otherwise noted, all the fixes since v1.7.12 in the
maintenance track are contained in this release (see release notes
to them for details).
+ * The subcommand in "git remote" to remove a defined remote was
+ "rm" and the command did not take a fully-spelled "remove".
+ (merge e17dba8 nd/maint-remote-remove later to maint).
+
+ * After "gitk" showed the contents of a tag, neither "Reread
+ references" nor "Reload" did not update what is shown as the
+ contents of it, when the user overwrote the tag with "git tag -f".
+
+ * "git cvsimport" did not thoroughly cleanse tag names that it
+ inferred from the names of the tags it obtained from CVS, which
+ caused "git tag" to barf and stop the import in the middle.
+
+ * "git show --format='%ci'" did not give timestamp correctly for
+ commits created without human readable name on "committer" line.
+ (merge e27ddb6 jc/maint-ident-missing-human-name later to maint).
+
* "git cherry-pick A C B" used to replay changes in A and then B and
then C if these three commits had committer timestamps in that
order, which is not what the user who said "A C B" naturally
@@ -107,87 +137,14 @@ to them for details).
branches were counting in bytes, not in display columns.
(merge 1452bd6 nd/branch-v-alignment later to maint).
- * "git for-each-ref" did not currectly support more than one --sort
- option.
- (merge 3b51222 kk/maint-for-each-ref-multi-sort later to maint).
-
- * Pushing to smart HTTP server with recent Git fails without having
- the username in the URL to force authentication, if the server is
- configured to allow GET anonymously, while requiring authentication
- for POST.
- (merge b81401c jk/maint-http-half-auth-push later to maint).
-
* When looking for $HOME/.gitconfig etc., it is OK if we cannot read
them because they do not exist, but we did not diagnose existing
files that we cannot read.
- * The synopsis said "checkout [-B branch]" to make it clear the
- branch name is a parameter to the option, but the heading for the
- option description was "-B::", not "-B branch::", making the
- documentation misleading. There may be room in documentation pages
- of other commands for similar improvements (hint, hint).
- (merge 45aaf03 jc/maint-doc-checkout-b-always-takes-branch-name later to maint).
-
- * "git log .." errored out saying it is both rev range and a path
- when there is no disambiguating "--" is on the command line.
- Update the command line parser to interpret ".." as a path in such
- a case.
- (merge 003c84f jc/dotdot-is-parent-directory later to maint).
-
- * "git apply -p0" did not parse pathnames on "diff --git" line
- correctly. This caused patches that had pathnames in no other
- places to be mistakenly rejected (most notably, binary patch that
- does not rename nor change mode). Textual patches, renames or mode
- changes have preimage and postimage pathnames in different places
- in a form that can be parsed unambiguously and did not suffer from
- this problem.
- (merge 6a2abdc jc/apply-binary-p0 later to maint).
-
- * The exit status code from "git config" was way overspecified while
- being incorrect. The implementation has been updated to give the
- documented status for a case that was documented, and introduce a
- new code for "all other errors".
- (merge 9409c7a jc/maint-config-exit-status later to maint).
-
- * "git foo" errored out with "Not a directory" when the user had a
- non-directory on $PATH, and worse yet it masked an alias "foo" from
- running. (merge a785508 jc/maint-sane-execvp-notdir later to
- maint).
-
* The interactive prompt "git send-email" gives was error prone. It
asked "What e-mail address do you want to use?" with the address it
guessed (correctly) the user would want to use in its prompt,
tempting the user to say "y". But the response was taken as "No,
please use 'y' as the e-mail address instead", which is most
certainly not what the user meant.
- (merge 51bbccf jc/send-email-reconfirm later to maint).
-
- * "git stash apply/pop" did not trigger "rerere" upon conflicts
- unlike other mergy operations.
- (merge 743bf6d ph/stash-rerere later to maint).
-
- * "git submodule update -f" did not update paths in the working tree
- that has local changes.
- (merge 01d4721 sz/submodule-force-update later to maint).
-
- * We used curl_easy_strerror() without checking version of cURL,
- breaking the build for versions before curl 7.12.0.
- (merge 4246b0b js/no-curl-easy-strerror-on-old-curl later to maint).
-
- * Code to work around MacOS X UTF-8 gotcha has been cleaned up.
- (merge 9a27f96 rr/precompose-utf8-cleanup later to maint).
-
- * Documentation for the configuration file format had a confusing
- example.
- (merge d1e1fe7 mh/maint-config-doc-proxy-command later to maint).
-
- * "git submodule <cmd> path" did not error out when the path to the
- submodule was misspelt.
- (merge be9d0a3 hv/submodule-path-unmatch later to maint).
-
- * Some capabilities were asked by fetch-pack even when upload-pack
- did not advertise that they are available. fetch-pack has been
- fixed not to do so.
-
- * The output from "git diff -B" for a file that ends with an
- incomplete line did not put "\ No newline..." on a line of its own.
+ (merge 6183749 sb/send-email-reconfirm-fix later to maint).
View
@@ -1059,6 +1059,16 @@ <h2 id="_examples">EXAMPLES</h2>
<p>
restore hello.c from the index
</p>
+<div class="paragraph"><p>If you want to check out <em>all</em> C source files out of the index,
+you can say</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><tt>$ git checkout -- '*.c'</tt></pre>
+</div></div>
+<div class="paragraph"><p>Note the quotes around <tt>*.c</tt>. The file <tt>hello.c</tt> will also be
+checked out, even though it is no longer in the working tree,
+because the file globbing is used to match entries in the index
+(not in the working tree by the shell).</p></div>
<div class="paragraph"><p>If you have an unfortunate branch that is named <tt>hello.c</tt>, this
step would be confused as an instruction to switch to that branch.
You should instead write:</p></div>
@@ -1129,7 +1139,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-09-10 16:26:53 PDT
+Last updated 2012-09-12 15:56:23 PDT
</div>
</div>
</body>
View
@@ -367,6 +367,18 @@ $ git checkout hello.c <3>
<2> take a file out of another commit
<3> restore hello.c from the index
+
+If you want to check out _all_ C source files out of the index,
+you can say
++
+------------
+$ git checkout -- '*.c'
+------------
++
+Note the quotes around `*.c`. The file `hello.c` will also be
+checked out, even though it is no longer in the working tree,
+because the file globbing is used to match entries in the index
+(not in the working tree by the shell).
++
If you have an unfortunate branch that is named `hello.c`, this
step would be confused as an instruction to switch to that branch.
You should instead write:
Oops, something went wrong.

0 comments on commit 693e709

Please sign in to comment.