global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-18 20:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  Relnotes: remove items fixed on 'maint'
  Prepare for 1.7.3.4
  thread-utils.h: simplify the inclusion
  Makefile: transport-helper uses thread-utils.h
  Add --force to git-send-email documentation
This commit is contained in:
Junio C Hamano
2010-12-10 16:40:09 -08:00
parent 2d0123ccb9 4443091d96
commit d81e12d172
8 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Documentation/RelNotes/1.7.3.4.txt Normal file
View File

@@ -0,0 +1,32 @@
Git v1.7.3.4 Release Notes
==========================
Fixes since v1.7.3.3
--------------------
* Smart HTTP transport used to incorrectly retry redirected POST
request with GET request.
* "git apply" did not correctly handle patches that only change modes
if told to apply while stripping leading paths with -p option.
* "git apply" can deal with patches with timezone formatted with a
colon between the hours and minutes part (e.g. "-08:00" instead of
"-0800").
* "git cherry-pick" or "git revert" refused to work when a path that
would be modified by the operation was stat-dirty without a real
difference in the contents of the file.
* "git diff --check" reported an incorrect line number for added
blank lines at the end of file.
* Setting log.decorate configuration variable to "0" or "1" to mean
"false" or "true" did not work.
* "git tag -v" did not work with GPG signatures in rfc1991 mode.
* The post-receive-email sample hook was accidentally broken in 1.7.3.3
update.
Other minor fixes and documentation updates are also included.

13
Documentation/RelNotes/1.7.4.txt
View File

@@ -96,24 +96,11 @@ Fixes since v1.7.3
All of the fixes in v1.7.3.X maintenance series are included in this
release, unless otherwise noted.
* Smart HTTP transport used to incorrectly retry redirected POST
request with GET request (311e2ea006).
* "git apply" did not correctly handle patches that only change modes
if told to apply while stripping leading paths with -p option (aae1f6ac).
* "git apply" can deal with patches with timezone formatted with a
colon between the hours and minutes part (e.g. "-08:00" instead of
"-0800").
* "git checkout" removed an untracked file "foo" from the working
tree when switching to a branch that contains a tracked path
"foo/bar". Prevent this, just like the case where the conflicting
path were "foo" (c752e7f..7980872d).
* "git diff --check" reported an incorrect line number for added
blank lines at the end of file (8837d335).
* "git log --author=me --author=her" did not find commits written by
me or by her; instead it looked for commits written by me and by
her, which is impossible.