| blob | bddfb2ab1b704421a6dcaa6fa8a326a1cad9f781 |
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 argument.
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.
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.
49 * The --max-pack-size argument to 'git repack', 'git pack-objects', and
50 'git fast-import' was assuming the provided size to be expressed in MiB,
51 unlike the corresponding config variable and other similar options accepting
52 a size value. It is now expecting a size expressed in bytes, with a possible
53 unit suffix of 'k', 'm', or 'g'.
55 Updates since v1.6.6
56 --------------------
58 (subsystems)
60 * "git fast-import" updates; adds "option" and "feature" to detect the
61 mismatch between fast-import and the frontends that produce the input
62 stream.
64 * "git svn" support of subversion "merge tickets" and miscellaneous fixes.
66 * "gitk" updates.
68 * "gitweb" updates (code clean-up, load checking etc.)
70 (portability)
72 * Some more MSVC portability patches for msysgit port.
74 * Minimum Pthreads emulation for msysgit port.
76 (performance)
78 * More performance improvement patches for msysgit port.
80 (usability, bells and whistles)
82 * More commands learned "--quiet" and "--[no-]progress" options.
84 * Various commands given by the end user (e.g. diff.type.textconv,
85 and GIT_EDITOR) can be specified with command line arguments. E.g. it
86 is now possible to say "[diff "utf8doc"] textconv = nkf -w".
88 * "sparse checkout" feature allows only part of the work tree to be
89 checked out.
91 * HTTP transfer can use authentication scheme other than basic
92 (i.e./e.g. digest).
94 * Switching from a version of superproject that used to have a submodule
95 to another version of superproject that no longer has it did not remove
96 the submodule directory when it should (namely, when you are not
97 interested in the submodule at all and didn't clone/checkout).
99 * A new attribute conflict-marker-size can be used to change the size of
100 the conflict markers from the default 7; this is useful when tracked
101 contents (e.g. git-merge documentation) have strings that resemble the
102 conflict markers.
104 * A new syntax "<branch>@{upstream}" can be used on the command line to
105 substitute the name of the "upstream" of the branch. Missing branch
106 defaults to the current branch, so "git fetch && git merge @{upstream}"
107 will be equivalent to "git pull".
109 * "git branch --set-upstream" can be used to update the (surprise!) upstream
110 i.e. where the branch is supposed to pull and merge from (or rebase onto).
112 * "git checkout A...B" is a way to detach HEAD at the merge base between
113 A and B.
115 * "git checkout -m path" to reset the work tree file back into the
116 conflicted state works even when you already ran "git add path" and
117 resolved the conflicts.
119 * "git commit --date='<date>'" can be used to override the author date
120 just like "git commit --author='<name> <email>'" can be used to
121 override the author identity.
123 * "git commit --no-status" can be used to omit the listing of the index
124 and the work tree status in the editor used to prepare the log message.
126 * "git commit" warns a bit more aggressively until you configure user.email,
127 whose default value almost always is not (and fundamentally cannot be)
128 what you want.
130 * "git difftool" has been extended to make it easier to integrate it
131 with gitk.
133 * "git fetch --all" can now be used in place of "git remote update".
135 * "git grep" does not rely on external grep anymore. It can use more than
136 one threads to accelerate the operation.
138 * "git grep" learned "--no-index" option, to search inside contents that
139 are not managed by git.
141 * "git grep" learned "--quiet" option.
143 * "git log" and friends learned "--glob=heads/*" syntax that is a more
144 flexible way to complement "--branches/--tags/--remotes".
146 * "git merge" learned to pass options specific to strategy-backends. E.g.
148 - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree
149 strategy how much to shift the trees explicitly.
151 - "git merge -Xtheirs" can be used to auto-merge as much as possible,
152 while discarding your own changes and taking merged version in
153 conflicted regions.
155 * "git push" learned "git push origin --delete branch", a syntactic sugar
156 for "git push origin :branch".
158 * "git push" learned "git push --set-upstream origin forker:forkee" that
159 lets you configure your "forker" branch to later pull from "forkee"
160 branch at "origin".
162 * "git rebase --onto A...B" means the history is replayed on top of the
163 merge base between A and B.
165 * "git rebase -i" learned new action "fixup", that squashes the change
166 but does not affect existing log message.
168 * "git rebase -i" also learned --autosquash option, that is useful
169 together with the new "fixup" action.
171 * "git remote" learned set-url subcommand, to update (surprise!) url
172 for an existing remote nickname.
174 * "git rerere" learned "forget path" subcommand. Together with "git
175 checkout -m path" it will be useful when you recorded a wrong
176 resolution.
178 * Use of "git reset --merge" has become easier when resetting away a
179 conflicted mess left in the work tree.
181 * "git rerere" had rerere.autoupdate configuration but there was no way
182 to countermand it from the command line; --no-rerere-autoupdate option
183 given to "merge", "revert", etc. fixes this.
185 * "git status" learned "-s(hort)" output format.
187 (developers)
189 * The infrastructure to build foreign SCM interface has been updated.
191 * Many more commands are now built-in.
193 * THREADED_DELTA_SEARCH is no more. If you build with threads, delta
194 compression will always take advantage of it.
196 Fixes since v1.6.6
197 ------------------
199 All of the fixes in v1.6.6.X maintenance series are included in this
200 release, unless otherwise noted.
202 * "git branch -d branch" used to refuse deleting the branch even when
203 the branch is fully merged to its upstream branch if it is not merged
204 to the current branch. It now deletes it in such a case.
206 * "git config -f <relative path>" run from a subdirectory misbehaved.
207 65807ee (builtin-config: Fix crash when using "-f <relative path>"
208 from non-root dir, 2010-01-26) may be merged to older maintenance
209 branches.
211 * "git fast-import" did not correctly handle large blobs that may
212 bust the pack size limit.
214 * When using "git status" or asking "git diff" to compare the work tree
215 with something, they used to consider that a checked-out submodule with
216 uncommitted changes is not modified; this could cause people to forget
217 committing these changes in the submodule before committing in the
218 superproject. They now consider such a change as a modification and
219 "git diff" will append a "-dirty" to the work tree side when generating
220 patch output or when used with the --submodule option.
222 --
223 exec >/var/tmp/1
224 O=v1.7.0-rc1-42-g3bd8de5
225 echo O=$(git describe master)
226 git shortlog --no-merges $O..master ^maint