Browse files

Autogenerated HTML docs for v1.7.9-250-g624d3

  • Loading branch information...
1 parent 87460b8 commit d300403d591ea503f69ca10aeef5ae004e177ff3 @gitster committed Feb 13, 2012
Showing with 48 additions and 9 deletions.
  1. +40 −1 RelNotes/1.7.10.txt
  2. +2 −2 gitcore-tutorial.html
  3. +1 −1 gitcore-tutorial.txt
  4. +3 −3 gittutorial-2.html
  5. +2 −2 gittutorial-2.txt
View
41 RelNotes/1.7.10.txt
@@ -8,6 +8,8 @@ UI, Workflows & Features
* Improved handling of views, labels and branches in git-p4 (in contrib).
+ * Updated command line arguments completion script for zsh (in contrib).
+
* "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
support incremental imports.
@@ -20,6 +22,11 @@ UI, Workflows & Features
* "git clone" learned to detach the HEAD in the resulting repository
when the source repository's HEAD does not point to a branch.
+ * The commands in the "git diff" family and "git apply --stat" that
+ count the number of files changed and the number of lines
+ inserted/deleted have been updated to match the output from
+ "diffstat". This also opens the door to i18n this line.
+
* When showing a patch while ignoring whitespace changes, the context
lines are taken from the postimage, in order to make it easier to
view the output.
@@ -62,6 +69,38 @@ Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
releases are contained in this release (see release notes to them for
details).
+ * "git merge --no-edit $tag" failed to honor the --no-edit option.
+ (merge 3adab6f jn/merge-no-edit-fix later to maint).
+
+ * The error message emitted when we see an empty loose object was
+ not phrased correctly.
+ (merge 33e42de mm/empty-loose-error-message later to maint).
+
+ * Many small corner case bugs on "git tag -n" was corrected.
+ (merge 31fd8d7 jk/maint-tag-show-fixes later to maint).
+
+ * "git commit" refused to create a commit when entries added with
+ "add -N" remained in the index, without telling Git what their content
+ in the next commit should be. We should have created the commit without
+ these paths.
+ (merge 3f6d56d jc/maint-commit-ignore-i-t-a later to maint).
+
+ * Search box in "gitweb" did not accept non-ASCII characters correctly.
+ (merge 84d9e2d jn/gitweb-search-utf-8 later to maint).
+
+ * The code to ask for password did not fall back to the terminal
+ input when GIT_ASKPASS is set but does not work (e.g. lack of X
+ with GUI askpass helper).
+ (merge 84d7273 jk/prompt-fallback-to-tty later to maint).
+
+ * map_user() was not rewriting its output correctly, which resulted
+ in the user visible symptom that "git blame -e" sometimes showed
+ excess '>' at the end of email addresses.
+ (merge f026358 jc/maint-mailmap-output later to maint).
+
+ * "checkout -b" did not allow switching out of an unborn branch.
+ (merge abe1998 jc/checkout-out-of-unborn later to maint).
+
* "add -e" learned not to show a diff for an otherwise unmodified
submodule that only has uncommitted local changes in the patch
prepared by for the user to edit.
@@ -85,7 +124,7 @@ details).
---
exec >/var/tmp/1
-O=v1.7.9-208-gee8d52f
+O=v1.7.9-249-gaa47ec9
echo O=$(git describe)
git log --first-parent --oneline ^maint $O..
echo
View
4 gitcore-tutorial.html
@@ -1537,7 +1537,7 @@ <h2 id="_merging_two_branches">Merging two branches</h2>
Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)</tt></pre>
+ 2 files changed, 2 insertions(+)</tt></pre>
</div></div>
<div class="paragraph"><p>Because your branch did not contain anything more than what had
already been merged into the <tt>master</tt> branch, the merge operation did
@@ -2311,7 +2311,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-13 00:08:46 PDT
</div>
</div>
</body>
View
2 gitcore-tutorial.txt
@@ -1004,7 +1004,7 @@ Updating from ae3a2da... to a80b4aa....
Fast-forward (no commit created; -m option ignored)
example | 1 +
hello | 1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ 2 files changed, 2 insertions(+)
----------------
Because your branch did not contain anything more than what had
View
6 gittutorial-2.html
@@ -608,12 +608,12 @@ <h2 id="_the_git_object_database">The git object database</h2>
$ git add .
$ git commit -a -m "initial commit"
[master (root-commit) 54196cc] initial commit
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
create mode 100644 file.txt
$ echo 'hello world!' &gt;file.txt
$ git commit -a -m "add emphasis"
[master c4d59f3] add emphasis
- 1 files changed, 1 insertions(+), 1 deletions(-)</tt></pre>
+ 1 file changed, 1 insertion(+), 1 deletion(-)</tt></pre>
</div></div>
<div class="paragraph"><p>What are the 7 digits of hex that git responded to the commit with?</p></div>
<div class="paragraph"><p>We saw in part one of the tutorial that commits have names like this.
@@ -991,7 +991,7 @@ <h2 id="_git">GIT</h2>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2011-11-15 13:45:02 PDT
+Last updated 2012-02-13 00:08:46 PDT
</div>
</div>
</body>
View
4 gittutorial-2.txt
@@ -34,12 +34,12 @@ $ echo 'hello world' > file.txt
$ git add .
$ git commit -a -m "initial commit"
[master (root-commit) 54196cc] initial commit
- 1 files changed, 1 insertions(+), 0 deletions(-)
+ 1 file changed, 1 insertion(+)
create mode 100644 file.txt
$ echo 'hello world!' >file.txt
$ git commit -a -m "add emphasis"
[master c4d59f3] add emphasis
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
------------------------------------------------
What are the 7 digits of hex that git responded to the commit with?

0 comments on commit d300403

Please sign in to comment.