1GIT v1.6.1 Release Notes 2======================== 3 4Updates since v1.6.0 5-------------------- 6 7When some commands (e.g. "git log", "git diff") spawn pager internally, we 8used to make the pager the parent process of the git command that produces 9output. This meant that the exit status of the whole thing comes from the 10pager, not the underlying git command. We swapped the order of the 11processes around and you will see the exit code from the command from now 12on. 13 14(subsystems) 15 16* gitk can call out to git-gui to view "git blame" output; git-gui in turn 17 can run gitk from its blame view. 18 19* Various git-gui updates including updated translations. 20 21* Various gitweb updates from repo.or.cz installation. 22 23(portability) 24 25* A few test scripts used nonportable "grep" that did not work well on 26 some platforms, e.g. Solaris. 27 28* Sample pre-auto-gc script has OS X support. 29 30(performance) 31 32* The underlying diff machinery to produce textual output has been 33 optimized, which would result in faster "git blame" processing. 34 35* Most of the test scripts (but not the ones that try to run servers) 36 can be run in parallel. 37 38* Bash completion of refnames in a repository with massive number of 39 refs has been optimized. 40 41* Cygwin port uses native stat/lstat implementations when applicable, 42 which leads to improved performance. 43 44* "git push" pays attention to alternate repositories to avoid sending 45 unnecessary objects. 46 47* "git svn" can rebuild an out-of-date rev_map file. 48 49(usability, bells and whistles) 50 51* When you mistype a command name, git helpfully suggests what it guesses 52 you might have meant to say. help.autocorrect configuration can be set 53 to a non-zero value to accept the suggestion when git can uniquely 54 guess. 55 56* "git add -N path..." adds the named paths as an empty blob, so that 57 subsequent "git diff" will show a diff as if they are creation events. 58 59* "git apply" learned --include=paths option, similar to the existing 60 --exclude=paths option. 61 62* "git bisect" is careful about a user mistake and suggests testing of 63 merge base first when good is not a strict ancestor of bad. 64 65* "git checkout --track origin/hack" used to be a syntax error. It now 66 DWIMs to create a corresponding local branch "hack", i.e. acts as if you 67 said "git checkout --track -b hack origin/hack". 68 69* "git checkout --ours/--theirs" can be used to check out one side of a 70 conflicting merge during conflict resolution. 71 72* "git checkout -m" can be used to recreate the initial conflicted state 73 during conflict resolution. 74 75* "git cherry-pick" can also utilize rerere for conflict resolution. 76 77* "git commit --author=$name" can look up author name from existing 78 commits. 79 80* output from "git commit" has been reworded in a more concise and yet 81 more informative way. 82 83* "git count-objects" reports the on-disk footprint for packfiles and 84 their corresponding idx files. 85 86* "git daemon" learned --max-connections=<count> option. 87 88* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a 89 configuration option. 90 91* "git diff" learned to put more sensible hunk headers for Python, 92 HTML and ObjC contents. 93 94* "git diff" learned to vary the a/ vs b/ prefix depending on what are 95 being compared, controlled by diff.mnemonicprefix configuration. 96 97* "git diff" learned --dirstat-by-file to count changed files, not number 98 of lines, when summarizing the global picture. 99 100* "git diff" hunk header pattern for ObjC has been added. 101 102* "git for-each-ref" learned "refname:short" token that gives an 103 unambiguously abbreviated refname. 104 105* "git grep" learned to accept -z similar to GNU grep. 106 107* "git help" learned to use GIT_MAN_VIEWER environment variable before 108 using "man" program. 109 110* "git imap-send" can optionally talk SSL. 111 112* "git index-pack" is more careful against disk corruption while 113 completing a thin pack. 114 115* "git log --check" and "git log --exit-code" passes their underlying diff 116 status with their exit status code. 117 118* "git log" learned --simplify-merges, a milder variant of --full-history; 119 "gitk --simplify-merges" is easier to view than with --full-history. 120 121* "git log --pretty=format:" learned "%d" format element that inserts 122 names of tags that point at the commit. 123 124* "git merge --squash" and "git merge --no-ff" into an unborn branch are 125 noticed as user errors. 126 127* "git merge -s $strategy" can use a custom built strategy if you have a 128 command "git-merge-$strategy" on your $PATH. 129 130* "git reflog expire branch" can be used in place of "git reflog expire 131 refs/heads/branch". 132 133* "git submodule foreach" subcommand allows you to iterate over checked 134 out submodules. 135 136* "git submodule sync" subcommands allows you to update the origin URL 137 recorded in submodule directories from the toplevel .gitmodules file. 138 139* "git svn branch" can create new branches on the other end. 140 141(internal) 142 143* "git hash-object" learned to lie about the path being hashed, so that 144 correct gitattributes processing can be done while hashing contents 145 stored in a temporary file. 146 147* various callers of git-merge-recursive avoid forking it as an external 148 process. 149 150 151Fixes since v1.6.0 152------------------ 153 154All of the fixes in v1.6.0.X maintenance series are included in this 155release, unless otherwise noted. 156 157* "git add" and "git update-index" incorrectly allowed adding S/F when S 158 is a tracked symlink that points at a directory D that has a path F in 159 it (we still need to fix a similar nonsense when S is a submodule and F 160 is a path in it). 161 162* "git diff --stdin" used to take two trees on a line and compared them, 163 but we dropped support for such a use case long time ago. This has 164 been resurrected. 165 166* Giving 3 or more tree-ish to "git diff" is supposed to show the combined 167 diff from second and subsequent trees to the first one. b75271d ("git 168 diff <tree>{3,}": do not reverse order of arguments, 2008-10-10) needs 169 to be cherry-picked to 'maint'. 170 171* "git filter-branch" failed to rewrite a tag name with slashes in it. 172 173* "git push --tags --all $there" failed with generic usage message without 174 telling saying these two options are incompatible. 175 176* "git log --author/--committer" match used to potentially match the 177 timestamp part, exposing internal implementation detail. Also these did 178 not work with --fixed-strings match at all. 179 180-- 181exec >/var/tmp/1 182O=v1.6.0.2-553-g58e0fa5 183echo O=$(git describe master) 184git shortlog --no-merges $O..master ^maint