What's in git.git (stable)
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 7, 2007, 09:50 UTC
- Message-ID
- <7vfxye4yv7.fsf@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vhcixtnm4.fsf@gitster.siamese.dyndns.org>
Heavy merges to 'master' continues. We are almost there for -rc0. Merged to 'master' are:
* Colorized "add -i" (Dan Zwell) * Talk more about diff options in "git log" documentation (Miklos) * git-gui 0.9.1 preview * Make cvsserver act more like receive-pack (Michael Witten) * "git-clean <paths>" limits the damage to named paths * Use right Perl in Documentation/Makefile
Also people's favorite topic "squelching compilation warnings for iconv" is included.
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.
David Symonds (1):
Change from using email.com to example.com as example domain, as per RFC
2606.Junio C Hamano (2): git grep shows the same hit repeatedly for unmerged paths git-am -i: report rewritten title
Nguyễn Thái Ngọc Duy (3): Add missing inside_work_tree setting in setup_git_directory_gently Do check_repository_format() early Do check_repository_format() early (re-fix)
----------------------------------------------------------------
* The 'master' branch has these since the last announcement in addition to the above.
Björn Steinbrink (1): git config: Don't rely on regexec() returning 1 on non-match
Brian M. Carlson (1): git-gui: Reorder msgfmt command-line arguments
Christian Stimming (2): Update git-gui.pot with latest (few) string additions and changes. Update German translation. 100% completed.
Jakub Narebski (1): autoconf: Add test for OLD_ICONV (squelching compiler warning)
Jeff King (1): t7300: add test for clean with wildcard pathspec
Johannes Sixt (2): git-gui: Improve the application icon on Windows. for-each-ref: Fix quoting style constants.
Junio C Hamano (12): Run the specified perl in Documentation/ git-cvsserver runs hooks/post-update Revert "git-am: catch missing author date early." Documentation: color.* = true means "auto" git config --get-colorbool Color support for "git-add -i" git-clean: Honor pathspec. config --get-colorbool: diff.color is a deprecated synonym to color.diff hg-to-git: handle an empty dir in hg. do not discard status in fetch_refs_via_pack() git-status documentation: mention subdirectory behaviour Update draft release notes to 1.5.4
Kristian Høgsberg (1): Rewrite builtin-fetch option parsing to use parse_options().
Matthias Kestenholz (1): Documentation: add --patch option to synopsis of git-add
Michael Witten (1): git-cvsserver runs hooks/post-receive
Michele Ballabio (2): git-gui: fix a typo in lib/commit.tcl git-gui: update it.po and glossary/it.po
Miklos Vajna (2): Include diff options in the git-log manpage Update Hungarian translation. 100% completed.
Nanako Shiraishi (1): Update ja.po for git-gui
Robert Schiele (1): git-gui: install-sh from automake does not like -m755
Wincent Colaiuta (1): Silence iconv warnings on Leopard