Maintenance release 1.5.4.4 is out with accumulated fixes. Except for a few remaining topics ("remote rewritten in C", and "saner unpack_trees"), 'master' is almost feature complete for 1.5.5 and we will hopefully soon enter -rc freeze. ---------------------------------------------------------------- * The 'maint' branch has these fixes since the last announcement. Adeodato Simó (1): Really make the LF after reset in fast-import optional Johannes Schindelin (1): cvsexportcommit: be graceful when "cvs status" reorders the arguments Johannes Sixt (2): daemon: send more error messages to the syslog daemon: ensure that base-path is an existing directory John Goerzen (1): Fix dcommit, rebase when rewriteRoot is in use Junio C Hamano (2): Fix "git log --merge --left-right" GIT 1.5.4.4 Mike Hommey (1): Set proxy override with http_init() Santi Béjar (1): ident.c: reword error message when the user name cannot be determined Sebastian Noack (1): git-svn: Don't prompt for client cert password everytime. ---------------------------------------------------------------- * The 'master' branch has these since the last announcement in addition to the above. Andy Whitcroft (1): shortlog: take the first populated line of the description Carlos Rica (1): Make builtin-reset.c use parse_options. Charles Bailey (2): git-mergetool documentaiton: show toolnames in typewriter font merge-tool documentation: describe custom command usage Dmitry Potapov (2): Make private quote_path() in wt-status.c available as quote_path_relative() git-clean: correct printing relative path Jakub Narebski (1): gitweb: Fix and simplify pickaxe search Jeff King (1): Add a test for read-tree -u --reset with a D/F conflict Junio C Hamano (10): describe --always: fall back to showing an abbreviated object name am: read from the right mailbox when started from a subdirectory am: remove support for -d .dotest am: --rebasing get_pathspec(): die when an out-of-tree path is given Revert part of 744dacd (builtin-mv: minimum fix to avoid losing files) Revert part of 1abf095 (git-add: adjust to the get_pathspec() changes) Revert part of d089eba (setup: sanitize absolute and funny paths in get_pathspec()) git-clean: add tests for relative path filter-branch: handle "disappearing tree" case correctly in subdir filter Mark Levedahl (1): git-submodule - Allow adding a submodule in-place Michal Rokos (1): Add compat/snprintf.c for systems that return bogus Pierre Habouzit (2): parse-opt: bring PARSE_OPT_HIDDEN and NONEG to git-rev-parse --parseopt parse-options: new option type to treat an option-like parameter as an argument. Shawn O. Pearce (11): Remove unused variable in builtin-fetch find_non_local_tags Remove unnecessary delaying of free_refs(ref_map) in builtin-fetch Ensure tail pointer gets setup correctly when we fetch HEAD only Allow builtin-fetch's find_non_local_tags to append onto a list Free the path_lists used to find non-local tags in git-fetch Teach upload-pack to log the received need lines to an fd Make git-fetch follow tags we already have objects for sooner Teach git-fetch to grab a tag at the same time as a commit git-pack-objects: Automatically pack annotated tags if object was packed Teach fetch-pack/upload-pack about --include-tag Teach git-fetch to exploit server side automatic tag following -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html