]>
Commit | Line | Data |
---|---|---|
68b890a8 JH |
1 | Git v1.7.0 Release Notes |
2 | ======================== | |
3 | ||
4 | Notes 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 | |
c0da5db1 | 28 | not affect you if you run the command without argument. |
68b890a8 JH |
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 | ||
07cf0f24 | 41 | * External diff and textconv helpers are now executed using the shell. |
6ddf75ae JK |
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. | |
68b890a8 | 48 | |
4d0cc224 JH |
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 | |
07cf0f24 NP |
53 | unit suffix of 'k', 'm', or 'g'. |
54 | ||
68b890a8 JH |
55 | Updates since v1.6.6 |
56 | -------------------- | |
57 | ||
58 | (subsystems) | |
59 | ||
ff6d26a0 JH |
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. | |
63 | ||
3a985c27 JH |
64 | * "git svn" support of subversion "merge tickets" and miscellaneous fixes. |
65 | ||
66 | * "gitk" updates. | |
67 | ||
68b890a8 JH |
68 | (portability) |
69 | ||
d07430f9 JH |
70 | * Some more MSVC portability patches for msysgit port. |
71 | ||
72 | * Minimum Pthreads emulation for msysgit port. | |
73 | ||
68b890a8 JH |
74 | (performance) |
75 | ||
d07430f9 JH |
76 | * More performance improvement patches for msysgit port. |
77 | ||
68b890a8 JH |
78 | (usability, bells and whistles) |
79 | ||
ff6d26a0 JH |
80 | * More commands learned "--quiet" and "--[no-]progress" options. |
81 | ||
82 | * Various commands given by the end user (e.g. diff.type.textconv, | |
83 | and GIT_EDITOR) can be specified with command line arguments. E.g. it | |
84 | is now possible to say "[diff "utf8doc"] textconv = nkf -w". | |
85 | ||
86 | * "sparse checkout" feature allows only part of the work tree to be | |
87 | checked out. | |
88 | ||
89 | * HTTP transfer can use authentication scheme other than basic | |
90 | (i.e./e.g. digest). | |
91 | ||
d07430f9 JH |
92 | * Switching from a version of superproject that used to have a submodule |
93 | to another version of superproject that no longer has it did not remove | |
94 | the submodule directory when it should (namely, when you are not | |
95 | interested in the submodule at all and didn't clone/checkout). | |
96 | ||
2eb41d72 JH |
97 | * A new attribute conflict-marker-size can be used to change the size of |
98 | the conflict markers from the default 7; this is useful when tracked | |
99 | contents (e.g. git-merge documentation) have strings that resemble the | |
100 | conflict markers. | |
101 | ||
c2c2be13 JH |
102 | * A new syntax "<branch>@{upstream}" can be used on the command line to |
103 | substitute the name of the "upstream" of the branch. Missing branch | |
104 | defaults to the current branch, so "git fetch && git merge @{upstream}" | |
105 | will be equivalent to "git pull". | |
106 | ||
107 | * "git branch --set-upstream" can be used to update the (surprise!) upstream | |
108 | i.e. where the branch is supposed to pull and merge from (or rebase onto). | |
109 | ||
ff6d26a0 JH |
110 | * "git checkout A...B" is a way to detach HEAD at the merge base between |
111 | A and B. | |
112 | ||
2eb41d72 JH |
113 | * "git checkout -m path" to reset the work tree file back into the |
114 | conflicted state works even when you already ran "git add path" and | |
115 | resolved the conflicts. | |
116 | ||
d6f8fd0b JH |
117 | * "git commit --date='<date>'" can be used to override the author date |
118 | just like "git commit --author='<name> <email>'" can be used to | |
119 | override the author identity. | |
120 | ||
ff6d26a0 JH |
121 | * "git commit --no-status" can be used to omit the listing of the index |
122 | and the work tree status in the editor used to prepare the log message. | |
123 | ||
2eb41d72 JH |
124 | * "git commit" warns a bit more aggressively until you configure user.email, |
125 | whose default value almost always is not (and fundamentally cannot be) | |
126 | what you want. | |
127 | ||
128 | * "git difftool" has been extended to make it easier to integrate it | |
129 | with gitk. | |
130 | ||
ff6d26a0 JH |
131 | * "git fetch --all" can now be used in place of "git remote update". |
132 | ||
3a985c27 JH |
133 | * "git grep" does not rely on external grep anymore. It can use more than |
134 | one threads to accelerate the operation. | |
2eb41d72 JH |
135 | |
136 | * "git grep" learned "--no-index" option, to search inside contents that | |
137 | are not managed by git. | |
138 | ||
3a985c27 JH |
139 | * "git grep" learned "--quiet" option. |
140 | ||
c2c2be13 JH |
141 | * "git log" and friends learned "--glob=heads/*" syntax that is a more |
142 | flexible way to complement "--branches/--tags/--remotes". | |
143 | ||
2eb41d72 JH |
144 | * "git merge" learned to pass options specific to strategy-backends. E.g. |
145 | ||
146 | - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree | |
147 | strategy how much to shift the trees explicitly. | |
148 | ||
149 | - "git merge -Xtheirs" can be used to auto-merge as much as possible, | |
150 | while discarding your own changes and taking merged version in | |
151 | conflicted regions. | |
152 | ||
ff6d26a0 JH |
153 | * "git push" learned "git push origin --delete branch", a syntactic sugar |
154 | for "git push origin :branch". | |
155 | ||
2eb41d72 JH |
156 | * "git push" learned "git push --set-upstream origin forker:forkee" that |
157 | lets you configure your "forker" branch to later pull from "forkee" | |
158 | branch at "origin". | |
159 | ||
ff6d26a0 JH |
160 | * "git rebase --onto A...B" means the history is replayed on top of the |
161 | merge base between A and B. | |
162 | ||
2eb41d72 JH |
163 | * "git rebase -i" learned new action "fixup", that squashes the change |
164 | but does not affect existing log message. | |
165 | ||
166 | * "git rebase -i" also learned --autosquash option, that is useful | |
167 | together with the new "fixup" action. | |
168 | ||
c2c2be13 JH |
169 | * "git remote" learned set-url subcommand, to update (surprise!) url |
170 | for an existing remote nickname. | |
171 | ||
2eb41d72 JH |
172 | * "git rerere" learned "forget path" subcommand. Together with "git |
173 | checkout -m path" it will be useful when you recorded a wrong | |
174 | resolution. | |
175 | ||
ff6d26a0 JH |
176 | * Use of "git reset --merge" has become easier when resetting away a |
177 | conflicted mess left in the work tree. | |
178 | ||
d07430f9 JH |
179 | * "git rerere" had rerere.autoupdate configuration but there was no way |
180 | to countermand it from the command line; --no-rerere-autoupdate option | |
181 | given to "merge", "revert", etc. fixes this. | |
182 | ||
d6f8fd0b JH |
183 | * "git status" learned "-s(hort)" output format. |
184 | ||
ff6d26a0 JH |
185 | (developers) |
186 | ||
187 | * The infrastructure to build foreign SCM interface has been updated. | |
188 | ||
c2c2be13 | 189 | * Many more commands are now built-in. |
68b890a8 | 190 | |
7eb151d6 DM |
191 | * THREADED_DELTA_SEARCH is no more. If you build with threads, delta |
192 | compression will always take advantage of it. | |
193 | ||
68b890a8 JH |
194 | Fixes since v1.6.6 |
195 | ------------------ | |
196 | ||
197 | All of the fixes in v1.6.6.X maintenance series are included in this | |
198 | release, unless otherwise noted. | |
199 | ||
c2c2be13 JH |
200 | * "git branch -d branch" used to refuse deleting the branch even when |
201 | the branch is fully merged to its upstream branch if it is not merged | |
202 | to the current branch. It now deletes it in such a case. | |
203 | ||
3a985c27 JH |
204 | * "git config -f <relative path>" run from a subdirectory misbehaved. |
205 | 65807ee (builtin-config: Fix crash when using "-f <relative path>" | |
206 | from non-root dir, 2010-01-26) may be merged to older maintenance | |
207 | branches. | |
208 | ||
8d9e7d52 JL |
209 | * When using "git status" or asking "git diff" to compare the work tree |
210 | with something, they used to consider that a checked-out submodule with | |
211 | uncommitted changes is not modified; this could cause people to forget | |
212 | committing these changes in the submodule before committing in the | |
213 | superproject. They now consider such a change as a modification and | |
214 | "git diff" will append a "-dirty" to the work tree side when generating | |
215 | patch output or when used with the --submodule option. | |
c2c2be13 | 216 | |
68b890a8 JH |
217 | -- |
218 | exec >/var/tmp/1 | |
c0da5db1 | 219 | O=v1.7.0-rc1-6-g2ee8c5b |
68b890a8 JH |
220 | echo O=$(git describe master) |
221 | git shortlog --no-merges $O..master ^maint |