Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 1 | Git v1.7.0 Release Notes |
| 2 | ======================== |
| 3 | |
| 4 | Notes on behaviour change |
| 5 | ------------------------- |
| 6 | |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 7 | * "git push" into a branch that is currently checked out (i.e. pointed at by |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 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 | |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 22 | It has been possible already to configure send-email to send "shallow thread" |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 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 |
Junio C Hamano | c0da5db | 2010-01-31 12:20:30 -0800 | [diff] [blame] | 28 | not affect you if you run the command without argument. |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 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 |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 33 | amount of whitespace and nothing else; and "git diff -b" showed the |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 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 | |
Nicolas Pitre | 07cf0f2 | 2010-02-03 22:48:28 -0500 | [diff] [blame] | 41 | * External diff and textconv helpers are now executed using the shell. |
Jeff King | 6ddf75a | 2010-01-31 04:14:46 -0500 | [diff] [blame] | 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. |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 48 | |
Junio C Hamano | 4d0cc22 | 2010-02-04 11:10:44 -0800 | [diff] [blame] | 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 |
Nicolas Pitre | 07cf0f2 | 2010-02-03 22:48:28 -0500 | [diff] [blame] | 53 | unit suffix of 'k', 'm', or 'g'. |
| 54 | |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 55 | Updates since v1.6.6 |
| 56 | -------------------- |
| 57 | |
| 58 | (subsystems) |
| 59 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 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 | |
Junio C Hamano | 3a985c2 | 2010-01-29 23:38:31 -0800 | [diff] [blame] | 64 | * "git svn" support of subversion "merge tickets" and miscellaneous fixes. |
| 65 | |
Junio C Hamano | f476c0b | 2010-02-10 13:47:46 -0800 | [diff] [blame] | 66 | * "gitk" and "git gui" translation updates. |
Junio C Hamano | 3a985c2 | 2010-01-29 23:38:31 -0800 | [diff] [blame] | 67 | |
Junio C Hamano | 71f1a21 | 2010-02-05 16:36:56 -0800 | [diff] [blame] | 68 | * "gitweb" updates (code clean-up, load checking etc.) |
| 69 | |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 70 | (portability) |
| 71 | |
Junio C Hamano | d07430f | 2010-01-18 18:16:50 -0800 | [diff] [blame] | 72 | * Some more MSVC portability patches for msysgit port. |
| 73 | |
| 74 | * Minimum Pthreads emulation for msysgit port. |
| 75 | |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 76 | (performance) |
| 77 | |
Junio C Hamano | d07430f | 2010-01-18 18:16:50 -0800 | [diff] [blame] | 78 | * More performance improvement patches for msysgit port. |
| 79 | |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 80 | (usability, bells and whistles) |
| 81 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 82 | * More commands learned "--quiet" and "--[no-]progress" options. |
| 83 | |
| 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". |
| 87 | |
| 88 | * "sparse checkout" feature allows only part of the work tree to be |
| 89 | checked out. |
| 90 | |
| 91 | * HTTP transfer can use authentication scheme other than basic |
| 92 | (i.e./e.g. digest). |
| 93 | |
Junio C Hamano | d07430f | 2010-01-18 18:16:50 -0800 | [diff] [blame] | 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). |
| 98 | |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 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. |
| 103 | |
Junio C Hamano | c2c2be1 | 2010-01-22 16:34:50 -0800 | [diff] [blame] | 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". |
| 108 | |
Junio C Hamano | e923eae | 2010-02-12 15:45:05 -0800 | [diff] [blame] | 109 | * "git am --resolved" has a synonym "git am --continue". |
| 110 | |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 111 | * "git branch --set-upstream" can be used to update the (surprise!) upstream, |
Junio C Hamano | c2c2be1 | 2010-01-22 16:34:50 -0800 | [diff] [blame] | 112 | i.e. where the branch is supposed to pull and merge from (or rebase onto). |
| 113 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 114 | * "git checkout A...B" is a way to detach HEAD at the merge base between |
| 115 | A and B. |
| 116 | |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 117 | * "git checkout -m path" to reset the work tree file back into the |
| 118 | conflicted state works even when you already ran "git add path" and |
| 119 | resolved the conflicts. |
| 120 | |
Junio C Hamano | d6f8fd0 | 2010-01-07 15:47:32 -0800 | [diff] [blame] | 121 | * "git commit --date='<date>'" can be used to override the author date |
| 122 | just like "git commit --author='<name> <email>'" can be used to |
| 123 | override the author identity. |
| 124 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 125 | * "git commit --no-status" can be used to omit the listing of the index |
| 126 | and the work tree status in the editor used to prepare the log message. |
| 127 | |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 128 | * "git commit" warns a bit more aggressively until you configure user.email, |
| 129 | whose default value almost always is not (and fundamentally cannot be) |
| 130 | what you want. |
| 131 | |
| 132 | * "git difftool" has been extended to make it easier to integrate it |
| 133 | with gitk. |
| 134 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 135 | * "git fetch --all" can now be used in place of "git remote update". |
| 136 | |
Junio C Hamano | 3a985c2 | 2010-01-29 23:38:31 -0800 | [diff] [blame] | 137 | * "git grep" does not rely on external grep anymore. It can use more than |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 138 | one thread to accelerate the operation. |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 139 | |
Junio C Hamano | 3a985c2 | 2010-01-29 23:38:31 -0800 | [diff] [blame] | 140 | * "git grep" learned "--quiet" option. |
| 141 | |
Junio C Hamano | c2c2be1 | 2010-01-22 16:34:50 -0800 | [diff] [blame] | 142 | * "git log" and friends learned "--glob=heads/*" syntax that is a more |
| 143 | flexible way to complement "--branches/--tags/--remotes". |
| 144 | |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 145 | * "git merge" learned to pass options specific to strategy-backends. E.g. |
| 146 | |
| 147 | - "git merge -Xsubtree=path/to/directory" can be used to tell the subtree |
| 148 | strategy how much to shift the trees explicitly. |
| 149 | |
| 150 | - "git merge -Xtheirs" can be used to auto-merge as much as possible, |
| 151 | while discarding your own changes and taking merged version in |
| 152 | conflicted regions. |
| 153 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 154 | * "git push" learned "git push origin --delete branch", a syntactic sugar |
| 155 | for "git push origin :branch". |
| 156 | |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 157 | * "git push" learned "git push --set-upstream origin forker:forkee" that |
| 158 | lets you configure your "forker" branch to later pull from "forkee" |
| 159 | branch at "origin". |
| 160 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 161 | * "git rebase --onto A...B" means the history is replayed on top of the |
| 162 | merge base between A and B. |
| 163 | |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 164 | * "git rebase -i" learned new action "fixup" that squashes the change |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 165 | but does not affect existing log message. |
| 166 | |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 167 | * "git rebase -i" also learned --autosquash option that is useful |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 168 | together with the new "fixup" action. |
| 169 | |
Michael J Gruber | f937421 | 2010-02-12 10:47:53 +0100 | [diff] [blame] | 170 | * "git remote" learned set-url subcommand that updates (surprise!) url |
Junio C Hamano | c2c2be1 | 2010-01-22 16:34:50 -0800 | [diff] [blame] | 171 | for an existing remote nickname. |
| 172 | |
Junio C Hamano | 2eb41d7 | 2010-01-20 23:30:45 -0800 | [diff] [blame] | 173 | * "git rerere" learned "forget path" subcommand. Together with "git |
| 174 | checkout -m path" it will be useful when you recorded a wrong |
| 175 | resolution. |
| 176 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 177 | * Use of "git reset --merge" has become easier when resetting away a |
| 178 | conflicted mess left in the work tree. |
| 179 | |
Junio C Hamano | d07430f | 2010-01-18 18:16:50 -0800 | [diff] [blame] | 180 | * "git rerere" had rerere.autoupdate configuration but there was no way |
| 181 | to countermand it from the command line; --no-rerere-autoupdate option |
| 182 | given to "merge", "revert", etc. fixes this. |
| 183 | |
Junio C Hamano | d6f8fd0 | 2010-01-07 15:47:32 -0800 | [diff] [blame] | 184 | * "git status" learned "-s(hort)" output format. |
| 185 | |
Junio C Hamano | ff6d26a | 2010-01-17 16:47:48 -0800 | [diff] [blame] | 186 | (developers) |
| 187 | |
| 188 | * The infrastructure to build foreign SCM interface has been updated. |
| 189 | |
Junio C Hamano | c2c2be1 | 2010-01-22 16:34:50 -0800 | [diff] [blame] | 190 | * Many more commands are now built-in. |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 191 | |
Dan McGee | 7eb151d | 2010-01-29 19:22:19 -0600 | [diff] [blame] | 192 | * THREADED_DELTA_SEARCH is no more. If you build with threads, delta |
| 193 | compression will always take advantage of it. |
| 194 | |
Junio C Hamano | 68b890a | 2009-12-26 14:11:46 -0800 | [diff] [blame] | 195 | Fixes since v1.6.6 |
| 196 | ------------------ |
| 197 | |
| 198 | All of the fixes in v1.6.6.X maintenance series are included in this |
| 199 | release, unless otherwise noted. |
| 200 | |
Junio C Hamano | c2c2be1 | 2010-01-22 16:34:50 -0800 | [diff] [blame] | 201 | * "git branch -d branch" used to refuse deleting the branch even when |
| 202 | the branch is fully merged to its upstream branch if it is not merged |
| 203 | to the current branch. It now deletes it in such a case. |
| 204 | |
Ralf Wildenhues | 22e5e58 | 2010-08-22 13:12:12 +0200 | [diff] [blame] | 205 | * "filter-branch" command incorrectly said --prune-empty and --filter-commit |
Junio C Hamano | e923eae | 2010-02-12 15:45:05 -0800 | [diff] [blame] | 206 | were incompatible; the latter should be read as --commit-filter. |
| 207 | |
Jens Lehmann | 8d9e7d5 | 2010-02-01 19:09:39 +0100 | [diff] [blame] | 208 | * When using "git status" or asking "git diff" to compare the work tree |
| 209 | with something, they used to consider that a checked-out submodule with |
| 210 | uncommitted changes is not modified; this could cause people to forget |
| 211 | committing these changes in the submodule before committing in the |
| 212 | superproject. They now consider such a change as a modification and |
| 213 | "git diff" will append a "-dirty" to the work tree side when generating |
| 214 | patch output or when used with the --submodule option. |