Skip to content

Commit

Permalink
Git 1.7.10.2
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
gitster committed May 11, 2012
1 parent 8daff71 commit b6555d7
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 2 deletions.
14 changes: 14 additions & 0 deletions Documentation/RelNotes/1.7.10.2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ Fixes since v1.7.10.1
* HTTP transport that requires authentication did not work correctly when
multiple connections are used simultaneously.

* Minor memory leak during unpack_trees (hence "merge" and "checkout"
to check out another branch) has been plugged.

* In the older days, the header "Conflicts:" in "cherry-pick" and "merge"
was separated by a blank line from the list of paths that follow for
readability, but when "merge" was rewritten in C, we lost it by
Expand Down Expand Up @@ -52,13 +55,24 @@ Fixes since v1.7.10.1
* "git push" over smart-http lost progress output a few releases ago;
this release resurrects it.

* The error and advice messages given by "git push" when it fails due
to non-ff were not very helpful to new users; it has been broken
into three cases, and each is given a separate advice message.

* The insn sheet given by "rebase -i" did not make it clear that the
insn lines can be re-ordered to affect the order of the commits in
the resulting history.

* "git repack" used to write out unreachable objects as loose objects
when repacking, even if such loose objects will immediately pruned
due to its age.

* A contrib script "rerere-train" did not work out of the box unless
user futzed with her $PATH.

* "git rev-parse --show-prefix" used to emit nothing when run at the
top-level of the working tree, but now it gives a blank line.

* The i18n of error message "git stash save" was not properly done.

* "git submodule" used a sed script that some platforms mishandled.
Expand Down
3 changes: 2 additions & 1 deletion Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:

* link:v1.7.10.1/git.html[documentation for release 1.7.10.1]
* link:v1.7.10.2/git.html[documentation for release 1.7.10.2]

* release notes for
link:RelNotes/1.7.10.2.txt[1.7.10.2],
link:RelNotes/1.7.10.1.txt[1.7.10.1],
link:RelNotes/1.7.10.txt[1.7.10].

Expand Down
2 changes: 1 addition & 1 deletion GIT-VERSION-GEN
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

GVF=GIT-VERSION-FILE
DEF_VER=v1.7.10.1
DEF_VER=v1.7.10.2

LF='
'
Expand Down

0 comments on commit b6555d7

Please sign in to comment.