1.5.0 release notes.

Junio C Hamano committed Dec 27, 2006 at 21:33 UTC 0abfc34260b2245b3670808d148c607665114ab1
1 file changed +580
v1.5.0.txt new
+580
@@ -0,0 +1,580 @@
1 +Major changes that are not news
2 +-------------------------------
3 +
4 +There were a handful big changes that happened before this major
5 +release.
6 +
7 +This section is for people who are upgrading from ancient
8 +versions. Some of them are one-way street upgrades -- once you
9 +use the feature your repository cannot be used with ancient git.
10 +
11 + - There is a new configuration variable core.legacyheaders that
12 + changes the format of loose objects to more efficient to pack
13 + and send out of the repository over git native protocol.
14 + However, this format cannot be read by git older than v1.4.2;
15 + people fetching from your repository using older clients over
16 + dumb transports (e.g. http) will also be affected. This is
17 + not enabled by default.
18 +
19 + - Another configuration repack.usedeltabaseoffset further
20 + allows packfile to be created in more space efficient format,
21 + which cannot be read by git older than v1.4.3. This is not
22 + enabled by default.
23 +
24 + - 'git pack-refs' appeared in v1.4.4; this command allows tags
25 + to be accessed much more efficiently than the traditional
26 + 'one-file-per-tag' format. Older git-native client can fetch
27 + from a repository that packed its tags, but older dumb
28 + transports cannot. This is done by an explicit user action,
29 + either by use of "git pack-refs --prune" command or by use of
30 + "git gc" command.
31 +
32 + - 'git -p' to paginate anything -- many commands do pagination
33 + by default on a tty. Introduced between v1.4.1 and v1.4.2;
34 + this may surprise old timer users.
35 +
36 + - 'git archive' superseded 'git tar' in v1.4.3;
37 +
38 + - 'git cvsserver' was new invention in v1.3.0;
39 +
40 + - 'git repo-config', 'git grep', 'git rebase' and 'gitk' were
41 + seriously enhanced during v1.4.0 timeperiod.
42 +
43 + - 'gitweb' became part of git.git during v1.4.0 timeperiod and
44 + seriously modified since then.
45 +
46 + - reflog is an v1.4.0 invention.
47 +
48 +
49 +Updates in v1.5.0 since v1.4.4 series
50 +-------------------------------------
51 +
52 +* Index manipulation
53 +
54 + - git-add is to add contents to the index (aka "staging area"
55 + for the next commit), whether the file the contents happen to
56 + be is an existing one or a newly created one.
57 +
58 + - git-add without any argument does not add everything
59 + anymore. Use 'git-add .' instead. Also you can add
60 + otherwise ignored files with an -f option.
61 +
62 + - git-add tries to be more friendly to users by offering an
63 + interactive mode.
64 +
65 + - git-commit <path> used to refuse to commit if <path> was
66 + different between HEAD and the index (i.e. update-index was
67 + used on it earlier). This check was removed.
68 +
69 + - git-rm is much saner and safer. It is used to remove paths
70 + from both the index file and the working tree, and makes sure
71 + you are not losing any local modification before doing so.
72 +
73 + - git-reset <tree> <paths>... can be used to revert index
74 + entries for selected paths.
75 +
76 + - git-update-index is much less visible.
77 +
78 +
79 +* Repository layout and objects transfer
80 +
81 + - The data for origin repository is stored in the configuration
82 + file $GIT_DIR/config, not in $GIT_DIR/remotes/, for newly
83 + created clones (the latter is still supported).
84 +
85 + - git-clone always uses what is known as "separate remote"
86 + layout for a newly created repository with a working tree;
87 + i.e. tracking branches in $GIT_DIR/refs/remotes/origin/ are
88 + used to track branches from the origin. New branches that
89 + appear on the origin side after a clone is made are also
90 + tracked automatically.
91 +
92 + - git-branch and git-show-branch know remote tracking branches.
93 +
94 + - git-push can now be used to delete a remote branch or a tag.
95 + This requires the updated git on the remote side.
96 +
97 + - git-push more agressively keeps the transferred objects
98 + packed. Earlier we recommended to monitor amount of loose
99 + objects and repack regularly, but you should repack when you
100 + accumulated too many small packs this way as well. Updated
101 + git-count-objects helps you with this.
102 +
103 +
104 +* Reflog
105 +
106 + - Reflog records the history of where the tip of each branch
107 + was at each moment. This facility is enabled by default for
108 + repositories with working trees, and can be accessed with the
109 + "branch@{time}" and "branch@{Nth}" notation.
110 +
111 + - "git show-branch" learned showing the reflog data with the
112 + new --reflog option.
113 +
114 + - The commits referred to by reflog entries are now protected
115 + against pruning. The new command "git reflog expire" can be
116 + used to truncate older reflog entries and entries that refer
117 + to commits that have been pruned away previously with older
118 + versions of git.
119 +
120 + Existing repositories that have been using reflog may get
121 + complaints from fsck-objects; please run "git reflog expire
122 + --all" first to remove reflog entries that refer to commits
123 + that are no longer in the repository before attempting to
124 + repack it.
125 +
126 + - git-branch knows how to rename branches and moves existing
127 + reflog data from the old branch to the new one.
128 +
129 +
130 +* Packed refs
131 +
132 + - Repositories with hundreds of tags have been paying large
133 + overhead, both in storage and in runtime. A new command,
134 + git-pack-refs, can be used to "pack" them in more efficient
135 + representation.
136 +
137 + - Clones and fetches over dumb transports are now aware of
138 + packed refs and can download from repositories that use
139 + them.
140 +
141 +
142 +* Configuration
143 +
144 + - configuration related to colorize setting are consolidated
145 + under color.* namespace (older diff.color.*, status.color.*
146 + are still supported).
147 +
148 +
149 +* Less external dependency
150 +
151 + - We no longer require the "merge" program from the RCS suite.
152 + All 3-way file-level merges are now done internally.
153 +
154 + - The original implementation of git-merge-recursive which was
155 + in Python has been removed; we have C implementation of it
156 + now.
157 +
158 + - git-shortlog is no longer a Perl script. It no longer
159 + requires output piped from git-log; it can accept revision
160 + parameters directly on the command line.
161 +
162 +
163 +* I18n
164 +
165 + - We have always encouraged the commit message to be encoded in
166 + UTF-8, but the users are allowed to use legacy encoding as
167 + appropriate for their projects. This will continue to be the
168 + case. However, a non UTF-8 commit encoding _must_ be
169 + explicitly set with i18n.commitencoding in the repository
170 + where a commit is made; otherwise git-commit-tree will
171 + complain if the log message does not look like a valid UTF-8
172 + string.
173 +
174 + - The value of i18n.commitencoding in the originating
175 + repository is recorded in the commit object on the "encoding"
176 + header, if it is not UTF-8. git-log and friends notice this,
177 + and reencodes the message to the log output encoding when
178 + displaying, if they are different. The log output encoding
179 + is determined by "git log --encoding=<encoding>",
180 + i18n.logoutputencoding configuration, or i18n.commitencoding
181 + configuration, in the decreasing order of preference, and
182 + defaults to UTF-8.
183 +
184 +
185 +* User support
186 +
187 + - Quite a lot of documentation updates.
188 +
189 + - Bash completion scripts have been updated heavily.
190 +
191 + - Better error messages for often used Porcelainish commands.
192 +
193 +
194 +----------------------------------------------------------------
195 +Alex Riesen (1):
196 + Make perl/ build procedure ActiveState friendly.
197 +
198 +Alexandre Julliard (1):
199 + vc-git: Ignore errors caused by a non-existent directory in vc-git-registered.
200 +
201 +Andreas Ericsson (2):
202 + ls-files: Give hints when errors happen.
203 + git-diff: Introduce --index and deprecate --cached.
204 +
205 +Andy Parkins (8):
206 + Improve git-prune -n output
207 + Add support to git-branch to show local and remote branches
208 + Use .git/config for storing "origin" shortcut repository
209 + De-emphasise the symbolic link documentation.
210 + Explicitly add the default "git pull" behaviour to .git/config on clone
211 + Colourise git-branch output
212 + Allow subcommand.color and color.subcommand color configuration
213 + git-status always says what branch it's on
214 +
215 +Aneesh Kumar K.V (1):
216 + Add config example with respect to branch
217 +
218 +Brian Gernhardt (6):
219 + Add --add option to git-repo-config
220 + Make git-diff documentation use [--] when it should.
221 + Add documentation for show-branch --topics
222 + Remove COLLISION_CHECK from Makefile since it's not used.
223 + Keep "git --git-dir" from causing a bus error.
224 + Make git-show-branch options similar to git-branch.
225 +
226 +David Miller (1):
227 + Pass -M to diff in request-pull
228 +
229 +Eric Wong (29):
230 + git-svn: handle authentication without relying on cached tokens on disk
231 + git-svn: correctly access repos when only given partial read permissions
232 + git-svn: exit with status 1 for test failures
233 + git-svn: allow SVN:: lib users to track the root of the repository (again)
234 + git-svn: use ~/.subversion config files when using SVN:: libraries
235 + git-svn: enable delta transfers during fetches when using SVN:: libs
236 + git-svn: update tests for recent changes
237 + git-svn: error out when the SVN connection fails during a fetch
238 + git-svn: fix output reporting from the delta fetcher
239 + git-svn: color support for the log command
240 + git-svn: documentation updates
241 + git-svn: fix multi-init
242 + git-svn: avoid network timeouts for long-running fetches
243 + git-svn: extra error check to ensure we open a file correctly
244 + git-svn: use do_switch for --follow-parent if the SVN library supports it
245 + rerere: add clear, diff, and status commands
246 + rerere: record (or avoid misrecording) resolved, skipped or aborted rebase/am
247 + git-svn: enable logging of information not supported by git
248 + git-svn: allow dcommit to take an alternate head
249 + git-svn: correctly display fatal() error messages
250 + git-svn: correctly handle packed-refs in refs/remotes/
251 + git-svn: correctly handle "(no author)" when using an authors file
252 + git-svn: convert to using Git.pm
253 + git-svn: remove support for the svn command-line client
254 + git-svn: rename 'commit' command to 'set-tree'
255 + git-cvsserver: fix breakage when calling git merge-file
256 + Remove NO_ACCURATE_DIFF options from build systems
257 + git-svn: enable common fetch/commit options for dcommit
258 + Makefile: add quick-install-doc for installing pre-built manpages
259 +
260 +Han-Wen Nienhuys (2):
261 + git-tag: allow empty tag message if -m is given explicitly.
262 + ident.c: Trim hint printed when gecos is empty.
263 +
264 +Iñaki Arenaza (1):
265 + git-cvsimport: add support for CVS pserver method HTTP/1.x proxying
266 +
267 +J. Bruce Fields (5):
268 + Documentation: clarify tutorial pull/merge discussion
269 + cvs-migration: improved section titles, better push/commit explanation
270 + Documentation: reorganize cvs-migration.txt
271 + Documentation: update git-clone man page with new behavior
272 + Documentation: simpler shared repository creation
273 +
274 +Jakub Narebski (26):
275 + gitweb: Protect against possible warning in git_commitdiff
276 + gitweb: Buffer diff header to deal with split patches + git_patchset_body refactoring
277 + gitweb: Default to $hash_base or HEAD for $hash in "commit" and "commitdiff"
278 + gitweb: New improved formatting of chunk header in diff
279 + gitweb: Add an option to href() to return full URL
280 + gitweb: Refactor feed generation, make output prettier, add Atom feed
281 + gitweb: Finish restoring "blob" links in git_difftree_body
282 + gitweb: Replace SPC with &nbsp; also in tag comment
283 + gitweb: Do not use esc_html in esc_path
284 + gitweb: Use git-show-ref instead of git-peek-remote
285 + gitweb: Add author and committer email extraction to parse_commit
286 + gitweb: Add author and contributor email to Atom feed
287 + gitweb: Use author_epoch for pubdate in gitweb feeds
288 + gitweb: Make project description in projects list link to summary view
289 + gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url
290 + git-clone: Rename --use-immingled-remote option to --no-separate-remote
291 + Document git-diff whitespace flags -b and -w
292 + gitweb: Allow PNG, GIF, JPEG images to be displayed in "blob" view
293 + gitweb: Don't use Content-Encoding: header in git_snapshot
294 + gitweb: Show target of symbolic link in "tree" view
295 + gitweb: Add generic git_object subroutine to display object of any type
296 + gitweb: Hyperlink target of symbolic link in "tree" view (if possible)
297 + gitweb: SHA-1 in commit log message links to "object" view
298 + gitweb: Do not show difftree for merges in "commit" view
299 + gitweb: Add title attribute to ref marker with full ref name
300 + gitweb: Add "next" link to commit view
301 +
302 +Jeff King (2):
303 + shortlog: fix segfault on empty authorname
304 + vim syntax: follow recent changes to commit template
305 +
306 +Jim Meyering (1):
307 + Set permissions of each new file before "cvs add"ing it.
308 +
309 +Johannes Schindelin (30):
310 + Build in shortlog
311 + shortlog: do not crash on parsing "[PATCH"
312 + shortlog: read mailmap from ./.mailmap again
313 + shortlog: handle email addresses case-insensitively
314 + shortlog: fix "-n"
315 + shortlog: use pager
316 + sha1_object_info(): be consistent with read_sha1_file()
317 + xdiff: add xdl_merge()
318 + xdl_merge(): fix an off-by-one bug
319 + xdl_merge(): fix thinko
320 + diff -b: ignore whitespace at end of line
321 + xdl_merge(): fix and simplify conflict handling
322 + cvs-migration document: make the need for "push" more obvious
323 + Add builtin merge-file, a minimal replacement for RCS merge
324 + merge-file: support -p and -q; fix compile warnings
325 + Get rid of the dependency on RCS' merge program
326 + merge-recursive: add/add really is modify/modify with an empty base
327 + INSTALL: no need to have GNU diff installed
328 + git-show: grok blobs, trees and tags, too
329 + Document git-merge-file
330 + add a function to rename sections in the config
331 + git-branch: rename config vars branch.<branch>.*, too
332 + Introduce GIT_TEMPLATE_DIR
333 + Use git-merge-file in git-merge-one-file, too
334 + git-tag: support -F <file> option
335 + git-reset --hard: tell the user what the HEAD was reset to
336 + move read_mmfile() into xdiff-interface
337 + Add a test for git-rerere
338 + Make git-rerere a builtin
339 + commit-tree: encourage UTF-8 commit messages.
340 +
341 +Josef Weidendorfer (2):
342 + Add branch.*.merge warning and documentation update
343 + Move "no merge candidate" warning into git-pull
344 +
345 +Junio C Hamano (126):
346 + upload-pack: stop the other side when they have more roots than we do.
347 + apply --numstat: mark binary diffstat with - -, not 0 0
348 + pack-objects: tweak "do not even attempt delta" heuristics
349 + Store peeled refs in packed-refs file.
350 + remove merge-recursive-old
351 + git-merge: make it usable as the first class UI
352 + merge: allow merging into a yet-to-be-born branch.
353 + Store peeled refs in packed-refs (take 2).
354 + git-fetch: reuse ls-remote result.
355 + git-fetch: fix dumb protocol transport to fetch from pack-pruned ref
356 + git-fetch: allow glob pattern in refspec
357 + refs outside refs/{heads,tags} match less strongly.
358 + Typefix builtin-prune.c::prune_object()
359 + Allow git push to delete remote ref.
360 + gitweb: (style) use chomp without parentheses consistently.
361 + git-clone: stop dumb protocol from copying refs outside heads/ and tags/.
362 + git-branch -D: make it work even when on a yet-to-be-born branch
363 + git-shortlog: fix common repository prefix abbreviation.
364 + git-shortlog: make common repository prefix configurable with .mailmap
365 + git-commit: show --summary after successful commit.
366 + git-fetch: exit with non-zero status when fast-forward check fails
367 + git-fetch: allow forcing glob pattern in refspec
368 + fetch-pack: do not barf when duplicate re patterns are given
369 + grep: do not skip unmerged entries when grepping in the working tree.
370 + git-merge: tighten error checking.
371 + git-merge: do not leak rev-parse output used for checking internally.
372 + cvsimport: style fixup.
373 + git-merge: fix confusion between tag and branch
374 + xmerge: make return value from xdl_merge() more usable.
375 + merge-recursive: use xdl_merge().
376 + read-tree: further loosen "working file will be lost" check.
377 + Loosen "working file will be lost" check in Porcelain-ish
378 + read-tree: document --exclude-per-directory
379 + git-merge: squelch needless error message.
380 + git-merge: fix "fix confusion between tag and branch" for real
381 + Fix perl/ build.
382 + git-rerere: add 'gc' command.
383 + Documentation/git-commit: rewrite to make it more end-user friendly.
384 + git-commit: allow --only to lose what was staged earlier.
385 + shortlog: remove "[PATCH]" prefix from shortlog output
386 + shortlog: fix segfault on empty authorname
387 + diff --numstat: show binary with '-' to match "apply --numstat"
388 + add test case for recursive merge
389 + git-push: document removal of remote ref with :<dst> pathspec
390 + Revert "git-diff: Introduce --index and deprecate --cached."
391 + git merge: reword failure message.
392 + spurious .sp in manpages
393 + git-push: accept tag <tag> as advertised.
394 + send-pack: tighten checks for remote names
395 + branch --color: change default color selection.
396 + git-blame: show lines attributed to boundary commits differently.
397 + config documentation: group color items together.
398 + git-svn: allow both diff.color and color.diff
399 + Update git-diff documentation
400 + git-fetch: make it work from within a subdirectory.
401 + git-reset: make it work from within a subdirectory.
402 + git-reset [--mixed] <tree> [--] <paths>...
403 + merge: give a bit prettier merge message to "merge branch~$n"
404 + git-clone: use wildcard specification for tracking branches
405 + git-pull: refuse default merge without branch.*.merge
406 + git-clone: lose the artificial "first" fetch refspec
407 + git-clone: lose the traditional 'no-separate-remote' layout
408 + update-index: make D/F conflict error a bit more verbose.
409 + git-add: remove conflicting entry when adding.
410 + Fix check_file_directory_conflict().
411 + Fix mis-mark-up in git-merge-file.txt documentation
412 + markup fix in svnimport documentation.
413 + rev-list --left-right
414 + Teach all of log family --left-right output.
415 + Make left-right automatic.
416 + Teach show-branch how to show ref-log data.
417 + git-fetch: Avoid reading packed refs over and over again
418 + avoid accessing _all_ loose refs in git-show-ref --verify
419 + show-ref: fix --quiet --verify
420 + show-ref: fix --verify --hash=length
421 + parse-remote::expand_refs_wildcard()
422 + show-ref: fix --exclude-existing
423 + racy-git: documentation updates.
424 + rerere: fix breakage of resolving.
425 + fix testsuite: make sure they use templates freshly built from the source
426 + Teach git-branch to delete tracking branches with -r -d
427 + blame: -b (blame.blankboundary) and --root (blame.showroot)
428 + git-add --interactive
429 + git-add --interactive: hunk splitting
430 + Revert "fix testsuite: make sure they use templates freshly built from the source"
431 + Do not create $GIT_DIR/remotes/ directory anymore.
432 + Use preprocessor constants for environment variable names.
433 + Revert "Make left-right automatic."
434 + fix populate-filespec
435 + config_rename_section: fix FILE* leak
436 + simplify inclusion of system header files.
437 + revision: --skip=<n>
438 + git-add: error out when given no arguments.
439 + compat/inet_ntop: do not use u_int
440 + diff documentation: mostly talk about <commit>
441 + add for_each_reflog_ent() iterator
442 + Protect commits recorded in reflog from pruning.
443 + Teach git-repack to preserve objects referred to by reflog entries.
444 + reflog: fix warning message.
445 + Move in_merge_bases() to commit.c
446 + git reflog expire
447 + Revert "git-pull: refuse default merge without branch.*.merge"
448 + parse-remote: mark all refs not for merge only when fetching more than one
449 + _XOPEN_SOURCE problem also exists on FreeBSD
450 + commit-tree: do not overflow MAXPARENT
451 + reflog expire: prune commits that are not incomplete
452 + merge and reset: adjust for "reset --hard" messages
453 + default pull: forget about "newbie protection" for now.
454 + Do not support "partial URL shorthand" anymore.
455 + Really fix headers for __FreeBSD__
456 + git-tag: lose exit after die
457 + reflog expire: do not punt on tags that point at non commits.
458 + Allow branch.*.merge to talk about remote tracking branches.
459 + git-add --interactive: add documentation
460 + match_pathspec() -- return how well the spec matched
461 + git-rm: update to saner semantics
462 + t3600: update the test for updated git rm
463 + git-rm: Documentation
464 + read_directory: show_both option.
465 + git-add: add ignored files when asked explicitly.
466 + git-add: warn when adding an ignored file with an explicit request.
467 + git-add -f: allow adding otherwise ignored files.
468 + GIT v1.5.0 preview
469 + Move encoding conversion routine out of mailinfo to utf8.c
470 + i18n.logToUTF8: convert commit log message to UTF-8
471 + Teach log family --encoding
472 +
473 +Lars Hjemli (4):
474 + Add -v and --abbrev options to git-branch
475 + git-branch: add options and tests for branch renaming
476 + rename_ref: use lstat(2) when testing for symlink
477 + git-branch: let caller specify logmsg
478 +
479 +Luben Tuikov (1):
480 + Export PERL_PATH
481 +
482 +Michael Loeffler (1):
483 + git-fetch: ignore dereferenced tags in expand_refs_wildcard
484 +
485 +Nicolas Pitre (12):
486 + builtin git-shortlog is broken
487 + pack-objects: remove redundent status information
488 + make 'git add' a first class user friendly interface to the index
489 + change the unpack limit treshold to a saner value
490 + repacked packs should be read-only
491 + make commit message a little more consistent and conforting
492 + make patch_delta() error cases a bit more verbose
493 + make git a bit less cryptic on fetch errors
494 + index-pack usage of mmap() is unacceptably slower on many OSes other than Linux
495 + clarify some error messages wrt unknown object types
496 + checkout: make the message about the need for a new branch a bit clearer
497 + add .mailmap for git-shortlog output with the git repository
498 +
499 +Paul Mackerras (1):
500 + gitk: Fix enabling/disabling of menu items on Mac OS X
501 +
502 +Peter Baumann (1):
503 + config option log.showroot to show the diff of root commits
504 +
505 +Petr Baudis (1):
506 + Make git-clone --use-separate-remote the default
507 +
508 +Quy Tonthat (4):
509 + git-clone documentation
510 + Documentation: new option -P for git-svnimport
511 + git-branch -d: do not stop at the first failure.
512 + Documentation/git-branch: new -r to delete remote-tracking branches.
513 +
514 +René Scharfe (1):
515 + shortlog: remove range check
516 +
517 +Robert Fitzsimons (17):
518 + gitweb: Show '...' links in "summary" view only if there are more items
519 + gitweb: Add missing show '...' links change.
520 + gitweb: optimize git_get_last_activity.
521 + gitweb: optimize git_shortlog_body.
522 + gitweb: optimize git_summary.
523 + gitweb: Use rev-list pattern search options.
524 + gitweb: Require a minimum of two character for the search text.
525 + gitweb: Allow search to be disabled from the config file.
526 + gitweb: Paginate commit/author/committer search output
527 + gitweb: Add parse_commits, used to bulk load commit objects.
528 + gitweb: We do longer need the --parents flag in rev-list.
529 + gitweb: Change summary, shortlog actions to use parse_commits.
530 + gitweb: Change log action to use parse_commits.
531 + gitweb: Change header search action to use parse_commits.
532 + gitweb: Change atom, rss actions to use parse_commits.
533 + gitweb: Change history action to use parse_commits.
534 + gitweb: Use rev-list --skip option.
535 +
536 +Robin Rosenberg (1):
537 + Make cvsexportcommit work with filenames with spaces and non-ascii characters.
538 +
539 +Sean Estabrooks (1):
540 + Update documentation to remove incorrect GIT_DIFF_OPTS example.
541 +
542 +Shawn O. Pearce (31):
543 + Teach git-completion.bash how to complete git-merge.
544 + Hide plumbing/transport commands from bash completion.
545 + Teach bash how to complete options for git-name-rev.
546 + Add current branch in PS1 support to git-completion.bash.
547 + Teach bash how to complete git-format-patch.
548 + Teach bash how to complete git-cherry-pick.
549 + Teach bash how to complete git-rebase.
550 + Teach bash about git log/show/whatchanged options.
551 + Support bash completion of refs/remote.
552 + Teach bash about git-repo-config.
553 + Support --strategy=x completion in addition to --strategy x.
554 + Cache the list of merge strategies and available commands during load.
555 + Teach bash about git-am/git-apply and their whitespace options.
556 + Teach bash how to complete long options for git-commit.
557 + Fix broken bash completion of local refs.
558 + Remove uncontested renamed files during merge.
559 + Avoid accessing a slow working copy during diffcore operations.
560 + Provide more meaningful output from 'git init-db'.
561 + Enable reflogs by default in any repository with a working directory.
562 + Teach bash the new features of 'git show'.
563 + Suggest use of "git add file1 file2" when there is nothing to commit.
564 + Align section headers of 'git status' to new 'git add'.
565 + Default GIT_COMMITTER_NAME to login name in recieve-pack.
566 + Suggest 'add' in am/revert/cherry-pick.
567 + Rename imap-send's internal info/warn functions.
568 + Introduce a global level warn() function.
569 + Don't crash during repack of a reflog with pruned commits.
570 + Use extended SHA1 syntax in merge-recursive conflicts.
571 + Display 'theirs' branch name when possible in merge.
572 + Rename gitfakemmap to git_mmap.
573 + Switch git_mmap to use pread.
574 +
575 +Terje Sten Bjerkseth (1):
576 + Fix system header problems on Mac OS X
577 +
578 +Uwe Zeisberger (1):
579 + Fix documentation copy&paste typo
580 +