1GIT v1.6.2 Release Notes 2======================== 3 4With the next major release, "git push" into a branch that is 5currently checked out will be refused by default. You can choose 6what should happen upon such a push by setting the configuration 7variable receive.denyCurrentBranch in the receiving repository. 8 9To ease the transition plan, the receiving repository of such a 10push running this release will issue a big warning when the 11configuration variable is missing. Please refer to: 12 13 http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 14 15for more details on the transition plan. 16 17 18Updates since v1.6.1 19-------------------- 20 21(subsystems) 22 23* git-svn updates. 24 25* gitweb updates, including a new patch view and RSS/Atom feed 26 improvements. 27 28* (contrib) git.el updates for better XEmacs compatibility; vc-git.el 29 is not shiped with git anymore (it is part of official Emacs) 30 31(performance) 32 33* pack-objects autodetects the number of CPUs available and uses threaded 34 version. 35 36(usability, bells and whistles) 37 38* automatic typo correction works on aliases as well 39 40* @{-1} is a way to refer to the last branch you were on. This is 41 accepted not only where an object name is expected, but anywhere 42 a branch name is expected. E.g. "git branch --track mybranch @{-1}" 43 "git rev-parse --symbolic-full-name @{-1}". 44 45* "git add -p" learned 'g'oto action to jump directly to a hunk. 46 47* "git add -p" learned to find a hunk with given text with '/'. 48 49* "git add -p" optionally can be told to work with just the command letter 50 without Enter. 51 52* when "git am" stops upon a patch that does not apply, it shows the 53 title of the offending patch. 54 55* "git am --directory=<dir>" and "git am --reject" passes these options 56 to underlying "git apply". 57 58* "git am" learned --ignore-date option. 59 60* "git blame" aligns author names better when they are spelled in 61 non US-ASCII encoding. 62 63* "git clone" now makes its best effort when cloning from an empty 64 repository to set up configuration variables to refer to the remote 65 repository. 66 67* "git checkout -" is a shorthand for "git checkout @{-1}". 68 69* "git cherry" defaults to whatever the current branch is tracking (if 70 exists) when the <upstream> argument is not given. 71 72* "git cvsserver" can be told not to add extra "via git-CVS emulator" to 73 the commit log message it serves via gitcvs.commitmsgannotation 74 configuration. 75 76* "git cvsserver" learned to handle 'noop' command some CVS clients seem 77 to expect to work. 78 79* "git diff" learned a new option --inter-hunk-context to coalesce close 80 hunks together and show context between them. 81 82* The definition of what constitutes a word for "git diff --color-words" 83 can be customized via gitattributes, command line or a configuration. 84 85* "git diff" learned --patience to run "patience diff" algorithm. 86 87* "git filter-branch" learned --prune-empty option that discards commits 88 that do not change the contents. 89 90* "git fsck" now checks loose objects in alternate object stores, instead 91 of misreporting them as missing. 92 93* "git grep -w" and "git grep" for fixed strings have been optimized. 94 95* "git mergetool" learned -y(--no-prompt) option to disable prompting. 96 97* "git rebase -i" can transplant a history down to root to elsewhere 98 with --root option. 99 100* "git reset --merge" is a new mode that works similar to the way 101 "git checkout" switches branches, taking the local changes while 102 switching to another commit. 103 104* "git tag" learned --contains that works the same way as the same option 105 from "git branch". 106 107 108Fixes since v1.6.1 109------------------ 110 111All of the fixes in v1.6.1.X maintenance series are included in this 112release, unless otherwise noted. 113 114Here are fixes that this release has, but have not been backported to 115v1.6.1.X series. 116 117* "git-add sub/file" when sub is a submodule incorrectly added the path to 118 the superproject. 119 120* "git bundle" did not exclude annotated tags even when a range given 121 from the command line wanted to. 122 123* "git filter-branch" unnecessarily refused to work when you had 124 checked out a different commit from what is recorded in the superproject 125 index in a submodule. 126 127* "git filter-branch" incorrectly tried to update a nonexistent work tree 128 at the end when it is run in a bare repository. 129 130* "git mergetool" used to ignore autocrlf and other attributes 131 based content rewriting. 132 133* branch switching and merges had a silly bug that did not validate 134 the correct directory when making sure an existing subdirectory is 135 clean. 136 137* "git -p cmd" when cmd is not a built-in one left the display in funny state 138 when killed in the middle. 139 140-- 141exec >/var/tmp/1 142O=v1.6.1.3-371-gc19923a 143echo O=$(git describe master) 144git shortlog --no-merges $O..master ^maint