1 Git v1.7.10 Release Notes
2 =========================
7 * From this release on, the "git merge" command in an interactive
8 session will start an editor when it automatically resolves the
9 merge for the user to explain the resulting commit, just like the
10 "git commit" command does when it wasn't given a commit message.
12 If you have a script that runs "git merge" and keeps its standard
13 input and output attached to the user's terminal, and if you do not
14 want the user to explain the resulting merge commits, you can
15 export GIT_MERGE_AUTOEDIT environment variable set to "no", like
20 export GIT_MERGE_AUTOEDIT
22 to disable this behaviour (if you want your users to explain their
23 merge commits, you do not have to do anything). Alternatively, you
24 can give the "--no-edit" option to individual invocations of the
25 "git merge" command if you know everybody who uses your script has
28 * The "--binary/-b" options to "git am" have been a no-op for quite a
29 while and were deprecated in mid 2008 (v1.6.0). When you give these
30 options to "git am", it will now warn and ask you not to use them.
32 * When you do not tell which branches and tags to push to the "git push"
33 command in any way, the command used "matching refs" rule to update
34 remote branches and tags with branches and tags with the same name you
35 locally have. In future versions of Git, this will change to use the
36 "upstream" rule to update the branch at the remote you would "pull"
37 from into your current branch with your local current branch. The
38 release after 1.7.10 will start issuing a warning about this change,
39 to encourage you to tell the command what to push out, e.g. by setting
40 push.default configuration.
46 UI, Workflows & Features
48 * various "gitk" updates.
50 * Teams for localizing the messages from the Porcelain layer of
51 commands are starting to form, thanks to Jiang Xin who volunteered
52 to be the localization coordinator. An initial set of translated
53 messages for simplified chinese is available.
55 * The configuration mechanism learned an "include" facility; an
56 assignment to the include.path pseudo-variable causes the named
57 file to be included in-place when Git looks up configuration
60 * A content filter (clean/smudge) used to be just a way to make the
61 recorded contents "more useful", and allowed to fail; a filter can
62 now optionally be marked as "required".
64 * Options whose names begin with "--no-" (e.g. the "--no-verify"
65 option of the "git commit" command) can be negated by omitting
66 "no-" from its name, e.g. "git commit --verify".
68 * "git am" learned to pass "-b" option to underlying "git mailinfo", so
69 that a bracketed string other than "PATCH" at the beginning can be kept.
71 * "git clone" learned "--single-branch" option to limit cloning to a
72 single branch (surprise!); tags that do not point into the history
73 of the branch are not fetched.
75 * "git clone" learned to detach the HEAD in the resulting repository
76 when the user specifies a tag with "--branch" (e.g., "--branch=v1.0").
77 Clone also learned to print the usual "detached HEAD" advice in such
78 a case, similar to "git checkout v1.0".
80 * When showing a patch while ignoring whitespace changes, the context
81 lines are taken from the postimage, in order to make it easier to
84 * "git diff --stat" learned to adjust the width of the output on
85 wider terminals, and give more columns to pathnames as needed.
87 * "diff-highlight" filter (in contrib/) was updated to produce more
88 aesthetically pleasing output.
90 * "fsck" learned "--no-dangling" option to omit dangling object
93 * "git log -G" and "git log -S" learned to pay attention to the "-i"
94 option. With "-i", "log -G" ignores the case when finding patch
95 hunks that introduce or remove a string that matches the given
96 pattern. Similarly with "-i", "log -S" ignores the case when
97 finding the commit the given block of text appears or disappears
100 * "git merge" in an interactive session learned to spawn the editor
101 by default to let the user edit the auto-generated merge message,
102 to encourage people to explain their merges better. Legacy scripts
103 can export GIT_MERGE_AUTOEDIT=no to retain the historical behavior.
104 Both "git merge" and "git pull" can be given --no-edit from the
105 command line to accept the auto-generated merge message.
107 * The advice message given when the user didn't give enough clue on
108 what to merge to "git pull" and "git merge" has been updated to
109 be more concise and easier to understand.
111 * "git push" learned the "--prune" option, similar to "git fetch".
113 * The whole directory that houses a top-level superproject managed by
114 "git submodule" can be moved to another place.
116 * "git symbolic-ref" learned the "--short" option to abbreviate the
117 refname it shows unambiguously.
119 * "git tag --list" can be given "--points-at <object>" to limit its
120 output to those that point at the given object.
122 * "gitweb" allows intermediate entries in the directory hierarchy
123 that leads to a project to be clicked, which in turn shows the
124 list of projects inside that directory.
126 * "gitweb" learned to read various pieces of information for the
127 repositories lazily, instead of reading everything that could be
128 needed (including the ones that are not necessary for a specific
131 * Project search in "gitweb" shows the substring that matched in the
132 project name and description highlighted.
134 * A new script "diffall" is added to contrib/; it drives an
135 external tool to perform a directory diff of two Git revisions
136 in one go, unlike "difftool" that compares one file at a time.
140 * Improved handling of views, labels and branches in "git-p4" (in contrib).
142 * "git-p4" (in contrib) suffered from unnecessary merge conflicts when
143 p4 expanded the embedded $RCS$-like keywords; it can be now told to
146 * Some "git-svn" updates.
148 * "vcs-svn"/"svn-fe" learned to read dumps with svn-deltas and
149 support incremental imports.
151 * "git difftool/mergetool" learned to drive DeltaWalker.
155 * Unnecessary calls to parse_object() "git upload-pack" makes in
156 response to "git fetch", have been eliminated, to help performance
157 in repositories with excessive number of refs.
159 Internal Implementation (please report possible regressions)
161 * Recursive call chains in "git index-pack" to deal with long delta
162 chains have been flattened, to reduce the stack footprint.
164 * Use of add_extra_ref() API is now gone, to make it possible to
165 cleanly restructure the overall refs API.
167 * The command line parser of "git pack-objects" now uses parse-options
170 * The test suite supports the new "test_pause" helper function.
172 * Parallel to the test suite, there is a beginning of performance
173 benchmarking framework.
175 * t/Makefile is adjusted to prevent newer versions of GNU make from
176 running tests in seemingly random order.
178 * The code to check if a path points at a file beyond a symbolic link
179 has been restructured to be thread-safe.
181 * When pruning directories that has become empty during "git prune"
182 and "git prune-packed", call closedir() that iterates over a
183 directory before rmdir() it.
185 Also contains minor documentation updates and code clean-ups.
191 Unless otherwise noted, all the fixes since v1.7.9 in the maintenance
192 releases are contained in this release (see release notes to them for
195 * Build with NO_PERL_MAKEMAKER was broken and Git::I18N did not work
196 with versions of Perl older than 5.8.3.
197 (merge 5eb660e ab/perl-i18n later to maint).
199 * "git tag -s" honored "gpg.program" configuration variable since
200 1.7.9, but "git tag -v" and "git verify-tag" didn't.
201 (merge a2c2506 az/verify-tag-use-gpg-config later to maint).
203 * "configure" script learned to take "--with-sane-tool-path" from the
204 command line to record SANE_TOOL_PATH (used to avoid broken platform
205 tools in /usr/bin) in config.mak.autogen. This may be useful for
206 people on Solaris who have saner tools outside /usr/xpg[46]/bin.
208 * zsh port of bash completion script needed another workaround.
212 O=v1.7.10-rc2-18-gee459ba
213 echo O=$(git describe)
214 git log --first-parent --oneline ^maint $O..
216 git shortlog --no-merges ^maint $O..
projects / thirdparty / git.git / blob