Right now 'next' is empty and there are a handful topics in 'pu': - Jens Lehmann's updates to omit expensive is_submodule_modified() call when running "diff --ignore-submodules" and to make "diff --submodule" to show the "dirty worktree" status. I think they should be in 1.7.0 as part of the series to show work tree/index dirtiness in "git diff" output from the superproject. - Christian Couder's "reset --keep". I am inclined to exclude it from 1.7.0 as I cannot make a convincing argument to sell this to users without confusing them (even I am not convinced even though I do fairly straight line development at day-job), but hopefully we can keep cooking it in 'pu/next'. - Johan Herland's notes updates. Won't be ready for 1.7.0 but hopefully we can keep cooking in 'pu/next'. - John Hawley's gitweb caching layer. Jakub is splitting them into smaller pieces and they are still generating discussions. - My "how about this" patch to make 'grep --author=foo --grep=bar' to implicitly run --all-match; this is not yet readyand needs reworking. There also is a discussion on //server/share path on msysgit, that was started since 288123f (ignore duplicated slashes in make_relative_path(), 2010-01-21). If that commit _breaks_ use case on msysgit that used to work, I think the sanest course of action is to revert it and ship 1.7.0 with the same breakage we've had forever when the user gives extra slashes in the paths to --git-dir or --work-tree options. We could instead apply Thomas's patch Message-ID: <379d55c6a4110736aadb8ace3b050de879a9deab.1264118830.git.trast@xxxxxxxxxxxxxxx> that changed behaviour in much narrower case, which should be safer. In any case, a more intrusive change for UNC is outside the scope of 1.7.0 (discussion and preparation can continue on 'pu/next'). I saw a few patches and discussion to git-p4 in contrib from Pal-Kristian Engstad and I understand that we are waiting for revised version before I should take any action on them. The above are the current set of unresolved topics and their status but I am sure I've missed some others. Please remind me and the list if there are other important ones that need to be discussed. -- 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