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 pathspec. 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 42Updates since v1.6.6 43-------------------- 44 45(subsystems) 46 47 * "git fast-import" updates; adds "option" and "feature" to detect the 48 mismatch between fast-import and the frontends that produce the input 49 stream. 50 51(portability) 52 53 * Some more MSVC portability patches for msysgit port. 54 55 * Minimum Pthreads emulation for msysgit port. 56 57(performance) 58 59 * More performance improvement patches for msysgit port. 60 61(usability, bells and whistles) 62 63 * More commands learned "--quiet" and "--[no-]progress" options. 64 65 * Various commands given by the end user (e.g. diff.type.textconv, 66 and GIT_EDITOR) can be specified with command line arguments. E.g. it 67 is now possible to say "[diff "utf8doc"] textconv = nkf -w". 68 69 * "sparse checkout" feature allows only part of the work tree to be 70 checked out. 71 72 * HTTP transfer can use authentication scheme other than basic 73 (i.e./e.g. digest). 74 75 * Switching from a version of superproject that used to have a submodule 76 to another version of superproject that no longer has it did not remove 77 the submodule directory when it should (namely, when you are not 78 interested in the submodule at all and didn't clone/checkout). 79 80 * A new attribute conflict-marker-size can be used to change the size of 81 the conflict markers from the default 7; this is useful when tracked 82 contents (e.g. git-merge documentation) have strings that resemble the 83 conflict markers. 84 85 * A new syntax "<branch>@{upstream}" can be used on the command line to 86 substitute the name of the "upstream" of the branch. Missing branch 87 defaults to the current branch, so "git fetch && git merge @{upstream}" 88 will be equivalent to "git pull". 89 90 * "git branch --set-upstream" can be used to update the (surprise!) upstream 91 i.e. where the branch is supposed to pull and merge from (or rebase onto). 92 93 * "git checkout A...B" is a way to detach HEAD at the merge base between 94 A and B. 95 96 * "git checkout -m path" to reset the work tree file back into the 97 conflicted state works even when you already ran "git add path" and 98 resolved the conflicts. 99 100 * "git commit --date='<date>'" can be used to override the author date 101 just like "git commit --author='<name> <email>'" can be used to 102 override the author identity. 103 104 * "git commit --no-status" can be used to omit the listing of the index 105 and the work tree status in the editor used to prepare the log message. 106 107 * "git commit" warns a bit more aggressively until you configure user.email, 108 whose default value almost always is not (and fundamentally cannot be) 109 what you want. 110 111 * "git difftool" has been extended to make it easier to integrate it 112 with gitk. 113 114 * "git fetch --all" can now be used in place of "git remote update". 115 116 * "git grep" does not rely on external grep anymore. 117 118 * "git grep" learned "--no-index" option, to search inside contents that 119 are not managed by git. 120 121 * "git log" and friends learned "--glob=heads/*" syntax that is a more 122 flexible way to complement "--branches/--tags/--remotes". 123 124 * "git merge" learned to pass options specific to strategy-backends. E.g. 125 126 - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree 127 strategy how much to shift the trees explicitly. 128 129 - "git merge -Xtheirs" can be used to auto-merge as much as possible, 130 while discarding your own changes and taking merged version in 131 conflicted regions. 132 133 * "git push" learned "git push origin --delete branch", a syntactic sugar 134 for "git push origin :branch". 135 136 * "git push" learned "git push --set-upstream origin forker:forkee" that 137 lets you configure your "forker" branch to later pull from "forkee" 138 branch at "origin". 139 140 * "git rebase --onto A...B" means the history is replayed on top of the 141 merge base between A and B. 142 143 * "git rebase -i" learned new action "fixup", that squashes the change 144 but does not affect existing log message. 145 146 * "git rebase -i" also learned --autosquash option, that is useful 147 together with the new "fixup" action. 148 149 * "git remote" learned set-url subcommand, to update (surprise!) url 150 for an existing remote nickname. 151 152 * "git rerere" learned "forget path" subcommand. Together with "git 153 checkout -m path" it will be useful when you recorded a wrong 154 resolution. 155 156 * Use of "git reset --merge" has become easier when resetting away a 157 conflicted mess left in the work tree. 158 159 * "git rerere" had rerere.autoupdate configuration but there was no way 160 to countermand it from the command line; --no-rerere-autoupdate option 161 given to "merge", "revert", etc. fixes this. 162 163 * "git status" learned "-s(hort)" output format. 164 165(developers) 166 167 * The infrastructure to build foreign SCM interface has been updated. 168 169 * Many more commands are now built-in. 170 171Fixes since v1.6.6 172------------------ 173 174All of the fixes in v1.6.6.X maintenance series are included in this 175release, unless otherwise noted. 176 177 * "git branch -d branch" used to refuse deleting the branch even when 178 the branch is fully merged to its upstream branch if it is not merged 179 to the current branch. It now deletes it in such a case. 180 181 * When "git diff" is asked to compare the work tree with something, 182 it used to consider that a checked-out submodule with uncommitted 183 changes is not modified; this could cause people to forget committing 184 these changes in the submodule before committing in the superproject. 185 It now considers such a change as a modification. 186 187-- 188exec >/var/tmp/1 189O=v1.6.6.1-434-g3521c1b 190echo O=$(git describe master) 191git shortlog --no-merges $O..master ^maint