Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The topics list the commits in reverse chronological order. I will start merging some topics from 'next' to 'master' this weekend. Probably will declare -rc1 next weekend. * jc/reflog (Sat Jan 6 22:32:41 2007 -0800) 5 commits + reflog --fix-stale: do not check the same trees and commits repeatedly. + reflog expire --fix-stale + Move traversal of reachable objects into a separate library. + builtin-prune: separate ref walking from reflog walking. + builtin-prune: make file-scope static struct to an argument. We would want to do more interesting things on reflog data (such as bisecting) and need to make reflog reliable for that. We allowed reflog to point at missing commits for too long, and this is to clean up entries that point at commits removed with older versions of git. This needs to be in v1.5.0 final. * jc/reset-remove (Fri Jan 5 01:38:56 2007 -0800) 2 commits + git-reset <tree> -- <path> restores absense of <path> in <tree> + diff-index --cached --raw: show tree entry on the LHS for unmerged entries. Will merge to master. * sp/mmap (Thu Jan 4 22:28:08 2007 -0500) 26 commits + Increase packedGit{Limit,WindowSize} on 64 bit systems. + Update packedGit config option documentation. + mmap: set FD_CLOEXEC for file descriptors we keep open for mmap() + pack-objects: fix use of use_pack(). + Fix random segfaults in pack-objects. + Cleanup read_cache_from error handling. + Replace mmap with xmmap, better handling MAP_FAILED. + Release pack windows before reporting out of memory. + Default core.packdGitWindowSize to 1 MiB if NO_MMAP. + Test suite for sliding window mmap implementation. + Create pack_report() as a debugging aid. + Support unmapping windows on 'temporary' packfiles. + Improve error message when packfile mmap fails. + Ensure core.packedGitWindowSize cannot be less than 2 pages. + Load core configuration in git-verify-pack. + Fully activate the sliding window pack access. + Unmap individual windows rather than entire files. + Document why header parsing won't exceed a window. + Loop over pack_windows when inflating/accessing data. + Replace use_packed_git with window cursors. + Refactor how we open pack files to prepare for multiple windows. + Create read_or_die utility routine. + Use off_t for index and pack file lengths. + Refactor packed_git to prepare for sliding mmap windows. + Introduce new config option for mmap limit. + Replace unpack_entry_gently with unpack_entry. Will merge to 'master'. * jc/remote (Wed Jan 3 12:13:04 2007 -0800) 1 commit + git-remote I described what's still missing in this, and the list may have ideas to enhance it. Will merge to 'master' and people can hack on it there. * jc/detached-head (Wed Jan 3 21:10:10 2007 +0100) 3 commits - git-branch: show detached HEAD - git-status: show detached HEAD - Detached HEAD (experimental) I personally feel this should be in v1.5.0.final, but it is not yet ready, unfortunately... * jr/status (Tue Jan 2 20:26:21 2007 +0100) 4 commits + Improve cached content header of status output + Support --amend on initial commit in status output + Improve "nothing to commit" part of status output + Clarify syntax and role of git-add in status output Will merge to 'master'. * jc/3way (Wed Nov 29 18:53:13 2006 -0800) 1 commit + git-merge: preserve and merge local changes when doing fast forward * jc/diff-apply-patch (Fri Sep 22 16:17:58 2006 -0700) 1 commit + git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2) * sp/merge (Sun Dec 31 00:02:13 2006 -0500) 3 commits - Refresh the index before starting merge-recursive. - Improve merge performance by avoiding in-index merges. - Avoid git-fetch in `git-pull .` when possible. * jc/diff (Mon Dec 25 01:08:50 2006 -0800) 2 commits - test-para: combined diff between HEAD, index and working tree. - para-walk: walk n trees, index and working tree in parallel * jc/explain (Mon Dec 4 19:35:04 2006 -0800) 1 commit - git-explain * jc/web (Wed Nov 8 14:54:09 2006 -0800) 1 commit - gitweb: steal loadavg throttle from kernel.org * jc/pickaxe (Sun Nov 5 11:52:43 2006 -0800) 1 commit - blame: --show-stats for easier optimization work. - 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