Permalink
Browse files

Autogenerated HTML docs for v1.7.12-464-g83379

  • Loading branch information...
1 parent f76c10b commit a3cfb7673d419cac3d57ad89e67537288d20696f @gitster committed Sep 15, 2012
Showing with 135 additions and 55 deletions.
  1. +46 −0 RelNotes/1.7.11.7.txt
  2. +69 −47 RelNotes/1.7.12.1.txt
  3. +7 −0 RelNotes/1.8.0.txt
  4. +2 −1 git-merge.html
  5. +2 −1 git-pull.html
  6. +2 −1 git-rebase.html
  7. +2 −1 git.txt
  8. +2 −2 gitattributes.html
  9. +1 −1 gitattributes.txt
  10. +2 −1 merge-strategies.txt
View
@@ -0,0 +1,46 @@
+Git v1.7.11.7 Release Notes
+===========================
+
+Fixes since v1.7.11.6
+---------------------
+
+ * 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.
+
+ * 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.
+
+ * "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.
+
+ * 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 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.
+
+ * 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.
+
+ * "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 show --quiet" ought to be a synonym for "git show -s", but
+ wasn't.
View
@@ -4,43 +4,6 @@ Git 1.7.12.1 Release Notes
Fixes since v1.7.12
-------------------
- * "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.
-
- * 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.
-
- * 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.
-
- * 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.
-
- * 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
@@ -49,6 +12,11 @@ Fixes since v1.7.12
in a form that can be parsed unambiguously and did not suffer from
this problem.
+ * "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
+ expects.
+
* "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).
@@ -57,14 +25,22 @@ Fixes since v1.7.12
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
+ * "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.
+
+ * "git for-each-ref" did not correctly 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.
+ * 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 prune" without "-v" used to warn about leftover temporary
files (which is an indication of an earlier aborted operation).
@@ -76,26 +52,72 @@ Fixes since v1.7.12
* The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent (the interactive one gave an abbreviated object name).
- * 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.
-
* 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.
+ * "git show --quiet" ought to be a synonym for "git show -s", but
+ wasn't.
+
+ * "git show --format='%ci'" did not give timestamp correctly for
+ commits created without human readable name on "committer" line.
* "git send-email" did not unquote encoded words that appear on the
header correctly, and lost "_" from strings.
+ * 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.
+
+ * "gitweb" when used with PATH_INFO failed to notice directories with
+ SP (and other characters that need URL-style quoting) in them.
+
* 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.
- * "gitweb" when used with PATH_INFO failed to notice directories with
- SP (and other characters that need URL-style quoting) in them.
+ * 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.
+
+ * 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".
+
+ * "ciabot" script (in contrib/) has been updated with extensive
+ documentation.
+
+ * 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.
+
+ * 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.
+
+ * The "--rebase" option to "git pull" can be abbreviated to "-r",
+ but we didn't document it.
+
+ * 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.
+
+ * 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.
View
@@ -31,6 +31,10 @@ UI, Workflows & Features
* A credential helper to allow access to the Gnome keyring has been
added.
+ * When "git am" sanitizes the Subject: line, we strip the prefix from
+ "Re: subject" and also from a less common "re: subject", but left
+ even less common "RE: subject" intact.
+
* It was tempting to say "git branch --set-upstream origin/master",
but that tells Git to arrange the local branch "origin/master" to
integrate with the currently checked out branch, which is highly
@@ -54,6 +58,9 @@ UI, Workflows & Features
* "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.
+ * The "-Xours" backend option to "git merge -s recursive" now takes
+ effect even on binary files.
+
Foreign Interface
View
@@ -1155,6 +1155,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
This option forces conflicting hunks to be auto-resolved cleanly by
favoring <em>our</em> version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
</p>
<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
even look at what the other tree contains at all. It discards everything
@@ -1165,7 +1166,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This is opposite of <em>ours</em>.
+ This is the opposite of <em>ours</em>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -1380,6 +1380,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
This option forces conflicting hunks to be auto-resolved cleanly by
favoring <em>our</em> version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
</p>
<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
even look at what the other tree contains at all. It discards everything
@@ -1390,7 +1391,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This is opposite of <em>ours</em>.
+ This is the opposite of <em>ours</em>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -1169,6 +1169,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
This option forces conflicting hunks to be auto-resolved cleanly by
favoring <em>our</em> version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
</p>
<div class="paragraph"><p>This should not be confused with the <em>ours</em> merge strategy, which does not
even look at what the other tree contains at all. It discards everything
@@ -1179,7 +1180,7 @@ <h2 id="_merge_strategies">MERGE STRATEGIES</h2>
</dt>
<dd>
<p>
- This is opposite of <em>ours</em>.
+ This is the opposite of <em>ours</em>.
</p>
</dd>
<dt class="hdlist1">
View
@@ -48,9 +48,10 @@ Documentation for older releases are available here:
* release notes for
link:RelNotes/1.7.12.txt[1.7.12].
-* link:v1.7.11.6/git.html[documentation for release 1.7.11.6]
+* link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
* release notes for
+ link:RelNotes/1.7.11.7.txt[1.7.11.7],
link:RelNotes/1.7.11.6.txt[1.7.11.6],
link:RelNotes/1.7.11.5.txt[1.7.11.5],
link:RelNotes/1.7.11.4.txt[1.7.11.4],
View
@@ -1529,7 +1529,7 @@ <h2 id="_defining_macro_attributes">DEFINING MACRO ATTRIBUTES</h2>
macro attribute "binary" is equivalent to:</p></div>
<div class="listingblock">
<div class="content">
-<pre><tt>[attr]binary -diff -text</tt></pre>
+<pre><tt>[attr]binary -diff -merge -text</tt></pre>
</div></div>
</div>
<h2 id="_example">EXAMPLE</h2>
@@ -1600,7 +1600,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2012-07-09 13:33:29 PDT
+Last updated 2012-09-14 22:31:56 PDT
</div>
</div>
</body>
View
@@ -927,7 +927,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in
macro attribute "binary" is equivalent to:
------------
-[attr]binary -diff -text
+[attr]binary -diff -merge -text
------------
View
@@ -32,13 +32,14 @@ ours;;
This option forces conflicting hunks to be auto-resolved cleanly by
favoring 'our' version. Changes from the other tree that do not
conflict with our side are reflected to the merge result.
+ For a binary file, the entire contents are taken from our side.
+
This should not be confused with the 'ours' merge strategy, which does not
even look at what the other tree contains at all. It discards everything
the other tree did, declaring 'our' history contains all that happened in it.
theirs;;
- This is opposite of 'ours'.
+ This is the opposite of 'ours'.
patience;;
With this option, 'merge-recursive' spends a little extra time

0 comments on commit a3cfb76

Please sign in to comment.