| blob | 997b026a735820359e5c44f5950a1a01ecddebe3 |
1 Git v1.7.0 Release Notes
2 ========================
4 Notes on behaviour change
5 -------------------------
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.
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.
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.
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.
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.
27 * "git status" is not "git commit --dry-run" anymore. This change does
28 not affect you if you run the command without pathspec.
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.
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.
42 Updates since v1.6.6
43 --------------------
45 (subsystems)
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.
51 * "git svn" support of subversion "merge tickets" and miscellaneous fixes.
53 * "gitk" updates.
55 (portability)
57 * Some more MSVC portability patches for msysgit port.
59 * Minimum Pthreads emulation for msysgit port.
61 (performance)
63 * More performance improvement patches for msysgit port.
65 (usability, bells and whistles)
67 * More commands learned "--quiet" and "--[no-]progress" options.
69 * Various commands given by the end user (e.g. diff.type.textconv,
70 and GIT_EDITOR) can be specified with command line arguments. E.g. it
71 is now possible to say "[diff "utf8doc"] textconv = nkf -w".
73 * "sparse checkout" feature allows only part of the work tree to be
74 checked out.
76 * HTTP transfer can use authentication scheme other than basic
77 (i.e./e.g. digest).
79 * Switching from a version of superproject that used to have a submodule
80 to another version of superproject that no longer has it did not remove
81 the submodule directory when it should (namely, when you are not
82 interested in the submodule at all and didn't clone/checkout).
84 * A new attribute conflict-marker-size can be used to change the size of
85 the conflict markers from the default 7; this is useful when tracked
86 contents (e.g. git-merge documentation) have strings that resemble the
87 conflict markers.
89 * A new syntax "<branch>@{upstream}" can be used on the command line to
90 substitute the name of the "upstream" of the branch. Missing branch
91 defaults to the current branch, so "git fetch && git merge @{upstream}"
92 will be equivalent to "git pull".
94 * "git branch --set-upstream" can be used to update the (surprise!) upstream
95 i.e. where the branch is supposed to pull and merge from (or rebase onto).
97 * "git checkout A...B" is a way to detach HEAD at the merge base between
98 A and B.
100 * "git checkout -m path" to reset the work tree file back into the
101 conflicted state works even when you already ran "git add path" and
102 resolved the conflicts.
104 * "git commit --date='<date>'" can be used to override the author date
105 just like "git commit --author='<name> <email>'" can be used to
106 override the author identity.
108 * "git commit --no-status" can be used to omit the listing of the index
109 and the work tree status in the editor used to prepare the log message.
111 * "git commit" warns a bit more aggressively until you configure user.email,
112 whose default value almost always is not (and fundamentally cannot be)
113 what you want.
115 * "git difftool" has been extended to make it easier to integrate it
116 with gitk.
118 * "git fetch --all" can now be used in place of "git remote update".
120 * "git grep" does not rely on external grep anymore. It can use more than
121 one threads to accelerate the operation.
123 * "git grep" learned "--no-index" option, to search inside contents that
124 are not managed by git.
126 * "git grep" learned "--quiet" option.
128 * "git log" and friends learned "--glob=heads/*" syntax that is a more
129 flexible way to complement "--branches/--tags/--remotes".
131 * "git merge" learned to pass options specific to strategy-backends. E.g.
133 - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
134 strategy how much to shift the trees explicitly.
136 - "git merge -Xtheirs" can be used to auto-merge as much as possible,
137 while discarding your own changes and taking merged version in
138 conflicted regions.
140 * "git push" learned "git push origin --delete branch", a syntactic sugar
141 for "git push origin :branch".
143 * "git push" learned "git push --set-upstream origin forker:forkee" that
144 lets you configure your "forker" branch to later pull from "forkee"
145 branch at "origin".
147 * "git rebase --onto A...B" means the history is replayed on top of the
148 merge base between A and B.
150 * "git rebase -i" learned new action "fixup", that squashes the change
151 but does not affect existing log message.
153 * "git rebase -i" also learned --autosquash option, that is useful
154 together with the new "fixup" action.
156 * "git remote" learned set-url subcommand, to update (surprise!) url
157 for an existing remote nickname.
159 * "git rerere" learned "forget path" subcommand. Together with "git
160 checkout -m path" it will be useful when you recorded a wrong
161 resolution.
163 * Use of "git reset --merge" has become easier when resetting away a
164 conflicted mess left in the work tree.
166 * "git rerere" had rerere.autoupdate configuration but there was no way
167 to countermand it from the command line; --no-rerere-autoupdate option
168 given to "merge", "revert", etc. fixes this.
170 * "git status" learned "-s(hort)" output format.
172 (developers)
174 * The infrastructure to build foreign SCM interface has been updated.
176 * Many more commands are now built-in.
178 Fixes since v1.6.6
179 ------------------
181 All of the fixes in v1.6.6.X maintenance series are included in this
182 release, unless otherwise noted.
184 * "git branch -d branch" used to refuse deleting the branch even when
185 the branch is fully merged to its upstream branch if it is not merged
186 to the current branch. It now deletes it in such a case.
188 * "git config -f <relative path>" run from a subdirectory misbehaved.
189 65807ee (builtin-config: Fix crash when using "-f <relative path>"
190 from non-root dir, 2010-01-26) may be merged to older maintenance
191 branches.
193 * When "git diff" is asked to compare the work tree with something,
194 it used to consider that a checked-out submodule with uncommitted
195 changes is not modified; this could cause people to forget committing
196 these changes in the submodule before committing in the superproject.
197 It now considers such a change as a modification.
199 --
200 exec >/var/tmp/1
201 O=v1.7.0-rc0-48-gdace5dd
202 O=v1.7.0-rc0-67-gb10b918
203 echo O=$(git describe master)
204 git shortlog --no-merges $O..master ^maint