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 check-attr --stdin" can check attributes for multiple paths. 66 67* "git checkout --track origin/hack" used to be a syntax error. It now 68 DWIMs to create a corresponding local branch "hack", i.e. acts as if you 69 said "git checkout --track -b hack origin/hack". 70 71* "git checkout --ours/--theirs" can be used to check out one side of a 72 conflicting merge during conflict resolution. 73 74* "git checkout -m" can be used to recreate the initial conflicted state 75 during conflict resolution. 76 77* "git cherry-pick" can also utilize rerere for conflict resolution. 78 79* "git clone" learned to be verbose with -v 80 81* "git commit --author=$name" can look up author name from existing 82 commits. 83 84* output from "git commit" has been reworded in a more concise and yet 85 more informative way. 86 87* "git count-objects" reports the on-disk footprint for packfiles and 88 their corresponding idx files. 89 90* "git daemon" learned --max-connections=<count> option. 91 92* "git daemon" exports REMOTE_ADDR to record client address, so that 93 spawned programs can act differently on it. 94 95* "git describe --tags" favours closer lightweight tags than farther 96 annotated tags now. 97 98* "git diff" learned to mimic --suppress-blank-empty from GNU diff via a 99 configuration option. 100 101* "git diff" learned to put more sensible hunk headers for Python, 102 HTML and ObjC contents. 103 104* "git diff" learned to vary the a/ vs b/ prefix depending on what are 105 being compared, controlled by diff.mnemonicprefix configuration. 106 107* "git diff" learned --dirstat-by-file to count changed files, not number 108 of lines, when summarizing the global picture. 109 110* "git diff" hunk header pattern for ObjC has been added. 111 112* a "textconv" filter that makes binary files textual form for human 113 consumption can be specified as an attribute for paths; "git diff" 114 learnt to make use of it. 115 116* "git for-each-ref" learned "refname:short" token that gives an 117 unambiguously abbreviated refname. 118 119* Auto-numbering of the subject lines is the default for "git 120 format-patch" now. 121 122* "git grep" learned to accept -z similar to GNU grep. 123 124* "git help" learned to use GIT_MAN_VIEWER environment variable before 125 using "man" program. 126 127* "git imap-send" can optionally talk SSL. 128 129* "git index-pack" is more careful against disk corruption while 130 completing a thin pack. 131 132* "git log --check" and "git log --exit-code" passes their underlying diff 133 status with their exit status code. 134 135* "git log" learned --simplify-merges, a milder variant of --full-history; 136 "gitk --simplify-merges" is easier to view than with --full-history. 137 138* "git log --pretty=format:" learned "%d" format element that inserts 139 names of tags that point at the commit. 140 141* "git merge --squash" and "git merge --no-ff" into an unborn branch are 142 noticed as user errors. 143 144* "git merge -s $strategy" can use a custom built strategy if you have a 145 command "git-merge-$strategy" on your $PATH. 146 147* "git rebase" honours pre-rebase hook; use --no-verify to bypass it. 148 149* "git rebase -p" uses interactive rebase machinery now to preserve the merges. 150 151* "git reflog expire branch" can be used in place of "git reflog expire 152 refs/heads/branch". 153 154* "git remote show $remote" lists remote branches one-per-line now. 155 156* when giving up resolving a conflicted merge, "git reset --hard" failed 157 to remove new paths from the working tree. [cherry-pick to 'maint'?] 158 159* "git submodule foreach" subcommand allows you to iterate over checked 160 out submodules. 161 162* "git submodule sync" subcommands allows you to update the origin URL 163 recorded in submodule directories from the toplevel .gitmodules file. 164 165* "git svn branch" can create new branches on the other end. 166 167(internal) 168 169* "git hash-object" learned to lie about the path being hashed, so that 170 correct gitattributes processing can be done while hashing contents 171 stored in a temporary file. 172 173* various callers of git-merge-recursive avoid forking it as an external 174 process. 175 176 177Fixes since v1.6.0 178------------------ 179 180All of the fixes in v1.6.0.X maintenance series are included in this 181release, unless otherwise noted. 182 183* "git add" and "git update-index" incorrectly allowed adding S/F when S 184 is a tracked symlink that points at a directory D that has a path F in 185 it (we still need to fix a similar nonsense when S is a submodule and F 186 is a path in it). 187 188* "git diff --stdin" used to take two trees on a line and compared them, 189 but we dropped support for such a use case long time ago. This has 190 been resurrected. 191 192* Giving 3 or more tree-ish to "git diff" is supposed to show the combined 193 diff from second and subsequent trees to the first one. b75271d ("git 194 diff <tree>{3,}": do not reverse order of arguments, 2008-10-10) needs 195 to be cherry-picked to 'maint'. 196 197* "git filter-branch" failed to rewrite a tag name with slashes in it. 198 199* "git push --tags --all $there" failed with generic usage message without 200 telling saying these two options are incompatible. 201 202* "git log --author/--committer" match used to potentially match the 203 timestamp part, exposing internal implementation detail. Also these did 204 not work with --fixed-strings match at all. 205 206-- 207exec >/var/tmp/1 208O=v1.6.0.3-574-gaebd173 209echo O=$(git describe master) 210git shortlog --no-merges $O..master ^maint