Skip to content

Commit

Permalink
Start 1.7.6 cycle
Browse files Browse the repository at this point in the history
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Junio C Hamano committed Apr 27, 2011
1 parent 9f5df6f commit e839fe6
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 2 deletions.
79 changes: 79 additions & 0 deletions Documentation/RelNotes/1.7.6.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
Git v1.7.5 Release Notes (draft)
========================

Updates since v1.7.5
--------------------

* Various git-svn updates.

* When an object "$tree:$path" does not exist, if $path does exist in the
subtree of $tree that corresponds to the subdirectory the user is in,
git now suggests using "$tree:./$path" in addition to the advice to use
the full path from the root of the working tree.

* "git blame" learned "--abbrev[=<n>]" option to control the minimum
number of hexdigits shown for commit object names.

* "git clean" used to fail on an empty directory that is not readable,
even though rmdir(2) could remove such a directory. Now we attempt it
as the last resort.

* "git format-patch" learned "--quiet" option to suppress the output of
the names of generated files.

* "git merge" learned "-" as a short-hand for "the previous branch", just
like the way "git checkout -" works.

* "git pack-object" now takes core.bigfilethreashold into account, just
like fast-imoprt does.

* "git reflog" allows options like "--format=.." to be given.

* "git stash apply" can now apply to a working tree with changes as long
as there is no overlapping change as the stash being applied.

* "git stash apply @{99999}" now is diagnosed as an error, unless you
really have that many stash entries.

Also contains various documentation updates.


Fixes since v1.7.5
------------------

Unless otherwise noted, all the fixes in 1.7.5.X maintenance track are
included in this release.

* The "--date=relative" output format used to say "X years, 12 months"
when it should have said "X+1 years".
(merge mg/x-years-12-months later)

* "git config" used to choke with an insanely long line.
(merge ef/maint-strbuf-init later)

* The "--dirstat" option of "diff" family of commands used to totally
ignore a change that only rearranged lines within a file. Such a
change now counts as at least a minimum but non zero change.

* The "--dirstat" option of "diff" family of commands used to use the
pathname in the original, instead of the pathname in the result,
when renames are involved.
(merge jh/dirstat for the above two later)

* "git format-patch" when run with "--quiet" option used to produce a
nonsense result that consists of alternating empty output.
(merge early part of cn/format-patch-quiet later)

* "git stash -p --no-keep-index" and "git stash --no-keep-index -p" now
mean the same thing.
(merge dm/stash-k-i-p later)

* "git upload-pack" (hence "git push" over git native protocol) had a
subtle race condition that could lead to a deadlock.
(merge jk/maint-upload-pack-shallow later)

---
exec >/var/tmp/1
echo O=$(git describe master)
O=v1.7.5
git shortlog --no-merges ^maint ^$O master
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.5
DEF_VER=v1.7.5.GIT

LF='
'
Expand Down
2 changes: 1 addition & 1 deletion RelNotes

0 comments on commit e839fe6

Please sign in to comment.