1Git v1.7.0 Release Notes 2======================== 3 4Notes on behaviour change 5------------------------- 6 7 * "git push" into a branch that is currently checked out (i.e. pointed by 8 HEAD in a repository that is not bare) is refused by default. 9 10 Similarly, "git push $there :$killed" to delete the branch $killed 11 in a remote repository $there, when $killed branch is the current 12 branch pointed at by its HEAD, will be refused by default. 13 14 Setting the configuration variables receive.denyCurrentBranch and 15 receive.denyDeleteCurrent to 'ignore' in the receiving repository 16 can be used to override these safety features. 17 18 * "git send-email" does not make deep threads by default when sending a 19 patch series with more than two messages. All messages will be sent 20 as a reply to the first message, i.e. cover letter. 21 22 It has been possible to configure send-email to send "shallow thread" 23 by setting sendemail.chainreplyto configuration variable to false. The 24 only thing this release does is to change the default when you haven't 25 configured that variable. 26 27 * "git status" is not "git commit --dry-run" anymore. This change does 28 not affect you if you run the command without argument. 29 30 * "git diff" traditionally treated various "ignore whitespace" options 31 only as a way to filter the patch output. "git diff --exit-code -b" 32 exited with non-zero status even if all changes were about changing the 33 ammount of whitespace and nothing else. and "git diff -b" showed the 34 "diff --git" header line for such a change without patch text. 35 36 In this release, the "ignore whitespaces" options affect the semantics 37 of the diff operation. A change that does not affect anything but 38 whitespaces is reported with zero exit status when run with 39 --exit-code, and there is no "diff --git" header for such a change. 40 41 * external diff and textconv helpers are now executed using the shell. 42 This makes them consistent with other programs executed by git, and 43 allows you to pass command-line parameters to the helpers. Any helper 44 paths containing spaces or other metacharacters now need to be 45 shell-quoted. The affected helpers are GIT_EXTERNAL_DIFF in the 46 environment, and diff.*.command and diff.*.textconv in the config 47 file. 48 49Updates since v1.6.6 50-------------------- 51 52(subsystems) 53 54 * "git fast-import" updates; adds "option" and "feature" to detect the 55 mismatch between fast-import and the frontends that produce the input 56 stream. 57 58 * "git svn" support of subversion "merge tickets" and miscellaneous fixes. 59 60 * "gitk" updates. 61 62(portability) 63 64 * Some more MSVC portability patches for msysgit port. 65 66 * Minimum Pthreads emulation for msysgit port. 67 68(performance) 69 70 * More performance improvement patches for msysgit port. 71 72(usability, bells and whistles) 73 74 * More commands learned "--quiet" and "--[no-]progress" options. 75 76 * Various commands given by the end user (e.g. diff.type.textconv, 77 and GIT_EDITOR) can be specified with command line arguments. E.g. it 78 is now possible to say "[diff "utf8doc"] textconv = nkf -w". 79 80 * "sparse checkout" feature allows only part of the work tree to be 81 checked out. 82 83 * HTTP transfer can use authentication scheme other than basic 84 (i.e./e.g. digest). 85 86 * Switching from a version of superproject that used to have a submodule 87 to another version of superproject that no longer has it did not remove 88 the submodule directory when it should (namely, when you are not 89 interested in the submodule at all and didn't clone/checkout). 90 91 * A new attribute conflict-marker-size can be used to change the size of 92 the conflict markers from the default 7; this is useful when tracked 93 contents (e.g. git-merge documentation) have strings that resemble the 94 conflict markers. 95 96 * A new syntax "<branch>@{upstream}" can be used on the command line to 97 substitute the name of the "upstream" of the branch. Missing branch 98 defaults to the current branch, so "git fetch && git merge @{upstream}" 99 will be equivalent to "git pull". 100 101 * "git branch --set-upstream" can be used to update the (surprise!) upstream 102 i.e. where the branch is supposed to pull and merge from (or rebase onto). 103 104 * "git checkout A...B" is a way to detach HEAD at the merge base between 105 A and B. 106 107 * "git checkout -m path" to reset the work tree file back into the 108 conflicted state works even when you already ran "git add path" and 109 resolved the conflicts. 110 111 * "git commit --date='<date>'" can be used to override the author date 112 just like "git commit --author='<name> <email>'" can be used to 113 override the author identity. 114 115 * "git commit --no-status" can be used to omit the listing of the index 116 and the work tree status in the editor used to prepare the log message. 117 118 * "git commit" warns a bit more aggressively until you configure user.email, 119 whose default value almost always is not (and fundamentally cannot be) 120 what you want. 121 122 * "git difftool" has been extended to make it easier to integrate it 123 with gitk. 124 125 * "git fetch --all" can now be used in place of "git remote update". 126 127 * "git grep" does not rely on external grep anymore. It can use more than 128 one threads to accelerate the operation. 129 130 * "git grep" learned "--no-index" option, to search inside contents that 131 are not managed by git. 132 133 * "git grep" learned "--quiet" option. 134 135 * "git log" and friends learned "--glob=heads/*" syntax that is a more 136 flexible way to complement "--branches/--tags/--remotes". 137 138 * "git merge" learned to pass options specific to strategy-backends. E.g. 139 140 - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree 141 strategy how much to shift the trees explicitly. 142 143 - "git merge -Xtheirs" can be used to auto-merge as much as possible, 144 while discarding your own changes and taking merged version in 145 conflicted regions. 146 147 * "git push" learned "git push origin --delete branch", a syntactic sugar 148 for "git push origin :branch". 149 150 * "git push" learned "git push --set-upstream origin forker:forkee" that 151 lets you configure your "forker" branch to later pull from "forkee" 152 branch at "origin". 153 154 * "git rebase --onto A...B" means the history is replayed on top of the 155 merge base between A and B. 156 157 * "git rebase -i" learned new action "fixup", that squashes the change 158 but does not affect existing log message. 159 160 * "git rebase -i" also learned --autosquash option, that is useful 161 together with the new "fixup" action. 162 163 * "git remote" learned set-url subcommand, to update (surprise!) url 164 for an existing remote nickname. 165 166 * "git rerere" learned "forget path" subcommand. Together with "git 167 checkout -m path" it will be useful when you recorded a wrong 168 resolution. 169 170 * Use of "git reset --merge" has become easier when resetting away a 171 conflicted mess left in the work tree. 172 173 * "git rerere" had rerere.autoupdate configuration but there was no way 174 to countermand it from the command line; --no-rerere-autoupdate option 175 given to "merge", "revert", etc. fixes this. 176 177 * "git status" learned "-s(hort)" output format. 178 179(developers) 180 181 * The infrastructure to build foreign SCM interface has been updated. 182 183 * Many more commands are now built-in. 184 185 * THREADED_DELTA_SEARCH is no more. If you build with threads, delta 186 compression will always take advantage of it. 187 188Fixes since v1.6.6 189------------------ 190 191All of the fixes in v1.6.6.X maintenance series are included in this 192release, unless otherwise noted. 193 194 * "git branch -d branch" used to refuse deleting the branch even when 195 the branch is fully merged to its upstream branch if it is not merged 196 to the current branch. It now deletes it in such a case. 197 198 * "git config -f <relative path>" run from a subdirectory misbehaved. 199 65807ee (builtin-config: Fix crash when using "-f <relative path>" 200 from non-root dir, 2010-01-26) may be merged to older maintenance 201 branches. 202 203 * When "git diff" is asked to compare the work tree with something, 204 it used to consider that a checked-out submodule with uncommitted 205 changes is not modified; this could cause people to forget committing 206 these changes in the submodule before committing in the superproject. 207 It now considers such a change as a modification. 208 209-- 210exec >/var/tmp/1 211O=v1.7.0-rc1-6-g2ee8c5b 212echo O=$(git describe master) 213git shortlog --no-merges $O..master ^maint