Meta/Announce: the RPMs are cut on FC11 now

Announce

@@ -48,7 +48,7 @@ $kind GIT $vername is available at the usual places$for_testing:
 
 The RPM binary packages for a few architectures are found in:
 
-  $rpmroot/git-*-$vername-1.fc9.\$arch.rpm	(RPM)
+  $rpmroot/git-*-$vername-1.fc11.\$arch.rpm	(RPM)
 
 BLURB HERE BLURB HERE BLURB HERE
 

whats/cooking/2009/11/04.txt

@@ -0,0 +1,623 @@
+To: git@vger.kernel.org
+Subject: What's cooking in git.git (Nov 2009, #04; Mon, 16)
+X-master-at: 785c58e5c7b7eaade64621a1ad5090da080c1788
+X-next-at: 5b5a93f7582d21b81a76f70ff8760e431d28fedb
+
+What's cooking in git.git (Nov 2009, #04; Mon, 16)
+--------------------------------------------------
+
+Here are the topics that have been cooking.  Commits prefixed with '-' are
+only in 'pu' while commits prefixed with '+' are in 'next'.  The ones
+marked with '.' do not appear in any of the integration branches, but I am
+still holding onto them.
+
+In 1.7.0, we plan to correct handful of warts in the interfaces everybody
+agrees that they were mistakes.  The resulting system may not be strictly
+backward compatible.  Currently planned changes are:
+
+ * refuse push to update the checked out branch in a non-bare repo by
+   default
+
+   Make "git push" into a repository to update the branch that is checked
+   out fail by default.  You can countermand this default by setting a
+   configuration variable in the receiving repository.
+
+   http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+
+ * refuse push to delete the current branch by default
+
+   Make "git push $there :$killed" to delete the branch that is pointed at
+   by its HEAD fail by default.  You can countermand this default by
+   setting a configuration variable in the receiving repository.
+
+   http://thread.gmane.org/gmane.comp.version-control.git/108862/focus=108936
+
+ * git-send-email won't make deep threads by default
+
+   Many people said that by default when sending more than 2 patches the
+   threading git-send-email makes by default is hard to read, and they
+   prefer the default be one cover letter and each patch as a direct
+   follow-up to the cover letter.  You can countermand this by setting a
+   configuration variable.
+
+   http://article.gmane.org/gmane.comp.version-control.git/109790
+
+ * git-status won't be "git-commit --dry-run" anymore
+
+   http://thread.gmane.org/gmane.comp.version-control.git/125989/focus=125993
+
+ * "git-diff -w --exit-code" will exit success if only differences it
+   found are whitespace changes that are stripped away from the output.
+
+   http://thread.gmane.org/gmane.comp.version-control.git/119731/focus=119751
+
+I wasn't fully functioning for the past few days, so this round we have
+only added new topics and new patches to existing ones, without changing
+the status of individual topics very much.
+
+--------------------------------------------------
+[Graduated to "master"]
+
+* bs/maint-pre-commit-hook-sample (2009-11-05) 1 commit.
+  (merged to 'next' on 2009-11-06 at d70f646)
+ + pre-commit.sample: Diff against the empty tree when HEAD is invalid
+
+* js/maint-diff-color-words (2009-10-30) 3 commits.
+  (merged to 'next' on 2009-11-10 at 5619714)
+ + diff --color-words: bit of clean-up
+ + diff --color-words -U0: fix the location of hunk headers
+ + t4034-diff-words: add a test for word diff without context
+
+Fixes a corner case of running --color-words with -U0.
+
+* sc/difftool-p4merge (2009-10-28) 1 commit
+  (merged to 'next' on 2009-10-31 at 194b5c5)
+ + mergetool--lib: add p4merge as a pre-configured mergetool option
+
+I do not do p4 nor use difftool, so it's much easier for me to merge this
+to 'master' and wait for anybody to scream if there is breakage.
+
+* jk/maint-add-p-empty (2009-10-27) 1 commit.
+  (merged to 'next' on 2009-10-30 at 2bd302f)
+ + add-interactive: handle deletion of empty files
+
+* lt/revision-bisect (2009-10-27) 1 commit.
+  (merged to 'next' on 2009-10-30 at 81ee52b)
+ + Add '--bisect' revision machinery argument
+
+* rs/pretty-wrap (2009-11-08) 2 commits
+  (merged to 'next' on 2009-11-08 at 8973fd8)
+ + log --format: don't ignore %w() at the start of format string
+  (merged to 'next' on 2009-10-30 at 403bbfe)
+ + Implement wrap format %w() as if it is a mode switch
+ (this branch uses js/log-rewrap.)
+
+* js/log-rewrap (2009-10-18) 3 commits
+  (merged to 'next' on 2009-10-30 at 403bbfe)
+ + Teach --wrap to only indent without wrapping
+ + Add strbuf_add_wrapped_text() to utf8.[ch]
+ + print_wrapped_text(): allow hard newlines
+ (this branch is used by rs/pretty-wrap.)
+
+* fc/doc-fast-forward (2009-10-24) 1 commit.
+  (merged to 'next' on 2009-11-01 at faaad90)
+ + Use 'fast-forward' all over the place
+
+* tz/maint-rpm (2009-11-11) 1 commit.
+ + Makefile: Ensure rpm packages can be read by older rpm versions
+
+--------------------------------------------------
+[New Topics]
+
+* jn/faster-completion-startup (2009-11-15) 1 commit.
+ - Speed up bash completion loading
+
+* th/maint-remote-update-help-string (2009-11-15) 1 commit.
+ - Update 'git remote update' usage string to match man page.
+
+* tr/maint-merge-ours-clarification (2009-11-15) 3 commits.
+ - rebase: refuse to rebase with -s ours
+ - rebase docs: clarify --merge and --strategy
+ - Documentation: clarify 'ours' merge strategy
+
+* tc/format-attribute (2009-11-14) 1 commit
+ - Check the format of more printf-type functions
+
+* jk/maint-break-rename-reduce-memory (2009-11-16) 2 commits.
+  (merged to 'next' on 2009-11-16 at 5b5a93f)
+ + diffcore-break: save cnt_data for other phases
+ + diffcore-break: free filespec data as we go
+
+* bc/grep-i-F (2009-11-06) 1 commit.
+ - grep: Allow case insensitive search of fixed-strings
+
+* mm/config-pathname-tilde-expand (2009-11-16) 2 commits.
+ - Squash as a fix-up
+ - Expand ~ and ~user in core.excludesfile, commit.template
+
+* pb/maint-use-custom-perl (2009-11-17) 1 commit.
+ - Make sure $PERL_PATH is defined when the test suite is run.
+
+* th/remote-usage (2009-11-16) 1 commit.
+ - git remote: Separate usage strings for subcommands
+
+* mo/maint-crlf-doc (2009-11-14) 1 commit.
+ - core.autocrlf documentation: mention the crlf attribute
+
+--------------------------------------------------
+[Stalled]
+
+* rj/cygwin-msvc (2009-11-09) 3 commits.
+ - Add explicit Cygwin check to guard WIN32 header inclusion
+ - MSVC: Add support for building with NO_MMAP
+ - Makefile: keep MSVC and Cygwin configuration separate
+ (this branch uses rj/maint-simplify-cygwin-makefile.)
+
+I think J6t was not happy with the tip one.
+
+* jc/fix-tree-walk (2009-10-22) 11 commits.
+  (merged to 'next' on 2009-10-22 at 10c0c8f)
+ + Revert failed attempt since 353c5ee
+ + read-tree --debug-unpack
+  (merged to 'next' on 2009-10-11 at 0b058e2)
+ + unpack-trees.c: look ahead in the index
+ + unpack-trees.c: prepare for looking ahead in the index
+ + Aggressive three-way merge: fix D/F case
+ + traverse_trees(): handle D/F conflict case sanely
+ + more D/F conflict tests
+ + tests: move convenience regexp to match object names to test-lib.sh
+ + unpack_callback(): use unpack_failed() consistently
+ + unpack-trees: typofix
+ + diff-lib.c: fix misleading comments on oneway_diff()
+
+This has some stupid bugs and temporarily reverted from 'next' until I can
+fix it, but the "temporarily" turned out to be very loooong.  Sigh...
+
+* jh/notes (2009-10-09) 22 commits.
+ - fast-import: Proper notes tree manipulation using the notes API
+ - Refactor notes concatenation into a flexible interface for combining notes
+ - Notes API: Allow multiple concurrent notes trees with new struct notes_tree
+ - Notes API: for_each_note(): Traverse the entire notes tree with a callback
+ - Notes API: get_note(): Return the note annotating the given object
+ - Notes API: add_note(): Add note objects to the internal notes tree structure
+ - Notes API: init_notes(): Initialize the notes tree from the given notes ref
+ - Notes API: get_commit_notes() -> format_note() + remove the commit restriction
+  (merged to 'next' on 2009-11-01 at 948327a)
+ + Add selftests verifying concatenation of multiple notes for the same commit
+ + Refactor notes code to concatenate multiple notes annotating the same object
+ + Add selftests verifying that we can parse notes trees with various fanouts
+ + Teach the notes lookup code to parse notes trees with various fanout schemes
+ + Teach notes code to free its internal data structures on request
+ + Add '%N'-format for pretty-printing commit notes
+ + Add flags to get_commit_notes() to control the format of the note string
+ + t3302-notes-index-expensive: Speed up create_repo()
+ + fast-import: Add support for importing commit notes
+ + Teach "-m <msg>" and "-F <file>" to "git notes edit"
+ + Add an expensive test for git-notes
+ + Speed up git notes lookup
+ + Add a script to edit/inspect notes
+ + Introduce commit notes
+
+I somehow thought that the later API part was waiting for updates but
+nothing seems to be happening.
+
+* jn/gitweb-blame (2009-09-01) 5 commits.
+ - gitweb: Minify gitweb.js if JSMIN is defined
+ - gitweb: Create links leading to 'blame_incremental' using JavaScript
+  (merged to 'next' on 2009-10-11 at 73c4a83)
+ + gitweb: Colorize 'blame_incremental' view during processing
+ + gitweb: Incremental blame (using JavaScript)
+ + gitweb: Add optional "time to generate page" info in footer
+
+Ajax-y blame.  Any progress or RFH?
+
+* sr/gfi-options (2009-09-06) 6 commits.
+ - fast-import: test the new option command
+ - fast-import: add option command
+ - fast-import: test the new feature command
+ - fast-import: add feature command
+ - fast-import: put marks reading in it's own function
+ - fast-import: put option parsing code in separate functions
+
+It seemed to be moving again soon, but nothing has happened yet...
+
+* je/send-email-no-subject (2009-08-05) 1 commit.
+  (merged to 'next' on 2009-10-11 at 1b99c56)
+ + send-email: confirm on empty mail subjects
+
+The existing tests cover the positive case (i.e. as long as the user says
+"yes" to the "do you really want to send this message that lacks subject",
+the message is sent) of this feature, but the feature itself needs its own
+test to verify the negative case (i.e. does it correctly stop if the user
+says "no"?)
+
+--------------------------------------------------
+[Cooking]
+
+* jn/help-everywhere (2009-11-09) 21 commits
+ - diff --no-index: make the usage string less scary
+ - merge-{recursive,subtree}: use usagef() to print usage
+ - Introduce usagef() that takes a printf-style format
+ - Let 'git <command> -h' show usage without a git dir
+ - Show usage string for 'git http-push -h'
+ - Let 'git http-fetch -h' show usage outside any git repository
+ - Show usage string for 'git stripspace -h'
+ - Show usage string for 'git unpack-file -h'
+ - Show usage string for 'git show-index -h'
+ - Show usage string for 'git rev-parse -h'
+ - Show usage string for 'git merge-one-file -h'
+ - Show usage string for 'git mailsplit -h'
+ - Show usage string for 'git imap-send -h'
+ - Show usage string for 'git get-tar-commit-id -h'
+ - Show usage string for 'git fast-import -h'
+ - Show usage string for 'git check-ref-format -h'
+ - Show usage string for 'git show-ref -h'
+ - Show usage string for 'git merge-ours -h'
+ - Show usage string for 'git commit-tree -h'
+ - Show usage string for 'git cherry -h'
+ - Show usage string for 'git grep -h'
+ (this branch uses jn/maint-http-fetch-mingw and jn/remove-fetch--tool.)
+
+There were unrelated but still worthy fixes, so I reordered some of them;
+also the "usage()" change is different from the one that was posted (see
+my comment in $gmane/132592).
+
+* jn/maint-http-fetch-mingw (2009-11-09) 1 commit.
+ - http-fetch: add missing initialization of argv0_path
+ (this branch is used by jn/help-everywhere.)
+
+* jn/remove-fetch--tool (2009-11-09) 1 commit
+ - Retire fetch--tool helper to contrib/examples
+ (this branch is used by jn/help-everywhere.)
+
+These two were originally part of the "help-everywhere" topic but
+they can stand on their own.
+
+All of the above should be ready for 'next'.
+
+* jc/log-stdin (2009-11-03) 1 commit
+ - Teach --stdin option to "log" family
+
+This is not signed-off (see $gmane/131971 for list of things you can do to
+help advancing this topic).
+
+* jn/gitweb-log-history (2009-11-13) 3 commits
+ - gitweb: Make 'history' view (re)use git_log_generic()
+ - gitweb: Refactor common parts of 'log' and 'shortlog' views
+ - gitweb: Refactor 'log' action generation, adding git_log_body()
+
+Soon in 'next'
+
+* jn/rfc-pull-rebase-error-message (2009-11-12) 1 commit
+ - git-pull.sh --rebase: overhaul error handling when no candidates are found
+
+I heard this needs at least retitling among other changes?
+
+* np/maint-sideband-favor-status (2009-11-11) 1 commit.
+  (merged to 'next' on 2009-11-15 at 3ecd874)
+ + give priority to progress messages
+
+Soon in 'master'.
+
+* rg/doc-workflow (2009-11-15) 3 commits.
+ - [An RFC fix-up to further reword release section]
+ - Corrections to release management section in gitworkflows.txt
+ - Add branch management for releases to gitworkflows
+
+Thomas's further rewording is added to the top but its log message needs
+rewriting and the text might need further restructuring.
+
+* sb/ls-tree-parseopt (2009-11-13) 2 commits.
+ - ls-tree: migrate to parse-options
+ - t3101: test more ls-tree options
+
+Looked fine but the test needs to be updated.  --abbrev=5 does not
+guarantee that output is always 5 hexdigits long.
+
+* jl/submodule-add-noname (2009-09-22) 1 commit.
+  (merged to 'next' on 2009-11-15 at 3a77d01)
+ + git submodule add: make the <path> parameter optional
+
+Dscho started an interesting discussion regarding the larger workflow in
+which the "submodule add" is used.  I think the patch itself makes sense
+but at the same time it probably makes sense to also take the <path> and
+infer the <repository> as Dscho suggested, probably in "git submodule
+add", not in "git add" proper, at least initially.
+
+* sc/protocol-doc (2009-11-03) 1 commit.
+  (merged to 'next' on 2009-11-15 at 32d6de8)
+ + Update packfile transfer protocol documentation
+
+* tr/filter-branch (2009-11-10) 2 commits.
+  (merged to 'next' on 2009-11-15 at 79c6a1d)
+ + filter-branch: nearest-ancestor rewriting outside subdir filter
+ + filter-branch: stop special-casing $filter_subdir argument
+
+Updated again.  Looked sane, except that the option might not be
+necessary, but that can be fixed while in 'next'.
+
+* em/commit-claim (2009-11-04) 1 commit
+ - commit -c/-C/--amend: reset timestamp and authorship to committer with --reset-author
+
+I just picked better bits from both versions, but this needs to be
+rethought.
+
+* bg/format-patch-doc-update (2009-11-07) 4 commits.
+ - format-patch: Add "--no-stat" as a synonym for "-p"
+ - format-patch documentation: Fix formatting
+ - format-patch documentation: Remove diff options that are not useful
+ - format-patch: Always generate a patch
+
+Looked sensible, even though this may want to wait for 1.7.0.  We'll see
+when we merge this to 'next'.  I tweaked the --no-stat patch with noneg
+bit; please check for sanity.
+
+* rj/maint-simplify-cygwin-makefile (2009-10-27) 1 commit.
+ - Makefile: merge two Cygwin configuration sections into one
+ (this branch is used by rj/cygwin-msvc.)
+
+This is one of the most obviously correct bit from "Compiling on Cygwin
+using MSVC fails" topic.
+
+* bg/fetch-multi (2009-11-10) 9 commits.
+ - Re-implement 'git remote update' using 'git fetch'
+ - builtin-fetch: add --dry-run option
+ - builtin-fetch: add --prune option
+ - teach warn_dangling_symref to take a FILE argument
+ - remote: refactor some logic into get_stale_heads()
+ - Add missing test for 'git remote update --prune'
+ - Add the configuration option skipFetchAll
+ - Teach the --multiple option to 'git fetch'
+ - Teach the --all option to 'git fetch'
+
+* cc/bisect-doc (2009-11-08) 1 commit
+ - Documentation: add "Fighting regressions with git bisect" article
+
+Any comments?  Should it go to Documentation/technical instead?
+
+* sb/tutorial-test (2009-11-06) 4 commits
+  (merged to 'next' on 2009-11-15 at 5c82651)
+ + t1200: prepare for merging with Fast-forward bikeshedding
+ + t1200: further modernize test script style
+ + t1200: Make documentation and test agree
+ + t1200: cleanup and modernize test style
+
+* jn/editor-pager (2009-10-30) 9 commits
+  (merged to 'next' on 2009-11-15 at 7f3e3ae)
+ + Provide a build time default-pager setting
+ + Provide a build time default-editor setting
+ + am -i, git-svn: use "git var GIT_PAGER"
+ + add -i, send-email, svn, p4, etc: use "git var GIT_EDITOR"
+ + Teach git var about GIT_PAGER
+ + Teach git var about GIT_EDITOR
+ + Suppress warnings from "git var -l"
+ + Do not use VISUAL editor on dumb terminals
+ + Handle more shell metacharacters in editor names
+
+* bw/autoconf-more (2009-11-04) 2 commits
+  (merged to 'next' on 2009-11-15 at e86a8c9)
+ + configure: add settings for gitconfig, editor and pager
+ + configure: add macro to set arbitrary make variables
+
+This will follow jn/editor-pager series.
+
+* sr/vcs-helper (2009-11-06) 12 commits
+ - Add Python support library for remote helpers
+ - Basic build infrastructure for Python scripts
+ - Allow helpers to request the path to the .git directory
+ - Allow helpers to report in "list" command that the ref is unchanged
+ - Allow helper to map private ref names into normal names
+ - Add support for "import" helper command
+ - Allow specifying the remote helper in the url
+ - Add a config option for remotes to specify a foreign vcs
+ - Allow fetch to modify refs
+ - Use a function to determine whether a remote is valid
+ - Allow programs to not depend on remotes having urls
+ - Fix memory leak in helper method for disconnect
+
+Re-rolled series that contains Daniel's and Johan's.
+Any comments?  Is everybody happy?
+
+* mr/gitweb-snapshot (2009-11-07) 4 commits.
+ - gitweb: Smarter snapshot names
+ - gitweb: Document current snapshot rules via new tests
+ - t/gitweb-lib.sh: Split gitweb output into headers and body
+  (merged to 'next' on 2009-10-11 at 22ba047)
+ + gitweb: check given hash before trying to create snapshot
+
+Replaced commits near the tip with recent updates.
+
+* jp/fetch-cull-many-refs (2009-11-13) 3 commits
+  (merged to 'next' on 2009-11-15 at db0f967)
+ + remote: fix use-after-free error detected by glibc in ref_remove_duplicates
+  (merged to 'next' on 2009-11-01 at 1f09ce9)
+ + fetch: Speed up fetch of large numbers of refs
+ + remote: Make ref_remove_duplicates faster for large numbers of refs
+
+Soon in 'master'.
+
+* jc/pretty-lf (2009-10-04) 1 commit.
+ - Pretty-format: %[+-]x to tweak inter-item newlines
+
+* ks/precompute-completion (2009-11-15) 4 commits.
+  (merged to 'next' on 2009-11-15 at 23cdb96)
+ + Revert ks/precompute-completion series
+  (merged to 'next' on 2009-10-28 at cd5177f)
+ + completion: ignore custom merge strategies when pre-generating
+  (merged to 'next' on 2009-10-22 at f46a28a)
+ + bug: precomputed completion includes scripts sources
+  (merged to 'next' on 2009-10-14 at adf722a)
+ + Speedup bash completion loading
+
+Reverted out of 'next', to be replaced with jn/faster-completion-startup
+topic.
+
+* sp/smart-http (2009-11-14) 37 commits
+ - http-backend: Let gcc check the format of more printf-type functions.
+ - http-backend: Fix access beyond end of string.
+  (merged to 'next' on 2009-11-15 at 2a326b2)
+ + http-backend: Fix bad treatment of uintmax_t in Content-Length
+ + t5551-http-fetch: Work around broken Accept header in libcurl
+ + t5551-http-fetch: Work around some libcurl versions
+ + http-backend: Protect GIT_PROJECT_ROOT from /../ requests
+ + Git-aware CGI to provide dumb HTTP transport
+  (merged to 'next' on 2009-11-06 at 666837c)
+ + http-backend: Test configuration options
+ + http-backend: Use http.getanyfile to disable dumb HTTP serving
+ + test smart http fetch and push
+ + http tests: use /dumb/ URL prefix
+ + set httpd port before sourcing lib-httpd
+ + t5540-http-push: remove redundant fetches
+ + Smart HTTP fetch: gzip requests
+ + Smart fetch over HTTP: client side
+ + Smart push over HTTP: client side
+ + Discover refs via smart HTTP server when available
+ + http-backend: more explict LocationMatch
+ + http-backend: add example for gitweb on same URL
+ + http-backend: use mod_alias instead of mod_rewrite
+ + http-backend: reword some documentation
+ + http-backend: add GIT_PROJECT_ROOT environment var
+ + Smart fetch and push over HTTP: server side
+ + Add stateless RPC options to upload-pack, receive-pack
+ + Git-aware CGI to provide dumb HTTP transport
+ + remote-helpers: return successfully if everything up-to-date
+ + Move WebDAV HTTP push under remote-curl
+ + remote-helpers: Support custom transport options
+ + remote-helpers: Fetch more than one ref in a batch
+ + fetch: Allow transport -v -v -v to set verbosity to 3
+ + remote-curl: Refactor walker initialization
+ + Add multi_ack_detailed capability to fetch-pack/upload-pack
+ + Move "get_ack()" back to fetch-pack
+ + fetch-pack: Use a strbuf to compose the want list
+ + pkt-line: Make packet_read_line easier to debug
+ + pkt-line: Add strbuf based functions
+ + http-push: fix check condition on http.c::finish_http_pack_request()
+
+* ef/msys-imap (2009-10-22) 9 commits.
+  (merged to 'next' on 2009-10-31 at 8630603)
+ + Windows: use BLK_SHA1 again
+ + MSVC: Enable OpenSSL, and translate -lcrypto
+ + mingw: enable OpenSSL
+ + mingw: wrap SSL_set_(w|r)fd to call _get_osfhandle
+ + imap-send: build imap-send on Windows
+ + imap-send: fix compilation-error on Windows
+ + imap-send: use run-command API for tunneling
+ + imap-send: use separate read and write fds
+ + imap-send: remove useless uid code
+
+Soon in 'master', unless I hear objections from msys folks or imap-send
+users.
+
+* nd/sparse (2009-08-20) 19 commits.
+ - sparse checkout: inhibit empty worktree
+ - Add tests for sparse checkout
+ - read-tree: add --no-sparse-checkout to disable sparse checkout support
+ - unpack-trees(): ignore worktree check outside checkout area
+ - unpack_trees(): apply $GIT_DIR/info/sparse-checkout to the final index
+ - unpack-trees(): "enable" sparse checkout and load $GIT_DIR/info/sparse-checkout
+ - unpack-trees.c: generalize verify_* functions
+ - unpack-trees(): add CE_WT_REMOVE to remove on worktree alone
+ - Introduce "sparse checkout"
+ - dir.c: export excluded_1() and add_excludes_from_file_1()
+ - excluded_1(): support exclude files in index
+ - unpack-trees(): carry skip-worktree bit over in merged_entry()
+ - Read .gitignore from index if it is skip-worktree
+ - Avoid writing to buffer in add_excludes_from_file_1()
+ - Teach Git to respect skip-worktree bit (writing part)
+ - Teach Git to respect skip-worktree bit (reading part)
+ - Introduce "skip-worktree" bit in index, teach Git to get/set this bit
+ - Add test-index-version
+ - update-index: refactor mark_valid() in preparation for new options
+
+The latest update I didn't look at very closely but I had an impression
+that it was touching very generic codepath that would affect non sparse
+cases, iow the patch looked very scary (the entire series already is).
+
+--------------------------------------------------
+[For 1.7.0]
+
+* jc/1.7.0-no-commit-no-ff-2 (2009-10-22) 1 commit.
+ - git-merge: forbid fast-forward and up-to-date when --no-commit is given
+
+This makes "git merge --no-commit" fail when it results in fast-forward or
+up-to-date.  I haven't described this at the beginning of this message
+yet, as it is not clear if this change is even necessary.  Opinions?
+
+* jk/1.7.0-status (2009-09-05) 5 commits.
+ - docs: note that status configuration affects only long format
+  (merged to 'next' on 2009-10-11 at 65c8513)
+ + commit: support alternate status formats
+ + status: add --porcelain output format
+ + status: refactor format option parsing
+ + status: refactor short-mode printing to its own function
+ (this branch uses jc/1.7.0-status.)
+
+Gives the --short output format to post 1.7.0 "git commit --dry-run" that
+is similar to that of post 1.7.0 "git status".
+
+The tip one is not in 'next' as I have been hoping that somebody may want
+to change the code to make it unnecessary, but it does not seem to be
+happening, so probably it should also go to 'next'.
+
+* jc/1.7.0-status (2009-09-05) 4 commits.
+  (merged to 'next' on 2009-10-11 at 9558627)
+ + status: typo fix in usage
+ + git status: not "commit --dry-run" anymore
+ + git stat -s: short status output
+ + git stat: the beginning of "status that is not a dry-run of commit"
+ (this branch is used by jk/1.7.0-status.)
+
+With this, "git status" is no longer "git commit --dry-run".
+
+* jc/1.7.0-send-email-no-thread-default (2009-08-22) 1 commit.
+  (merged to 'next' on 2009-10-11 at 043acdf)
+ + send-email: make --no-chain-reply-to the default
+
+* jc/1.7.0-diff-whitespace-only-status (2009-08-30) 4 commits.
+  (merged to 'next' on 2009-10-11 at 546c74d)
+ + diff.c: fix typoes in comments
+ + Make test case number unique
+ + diff: Rename QUIET internal option to QUICK
+ + diff: change semantics of "ignore whitespace" options
+
+This changes exit code from "git diff --ignore-whitespace" and friends
+when there is no actual output.  It is a backward incompatible change, but
+we could argue that it is a bugfix.
+
+* jc/1.7.0-push-safety (2009-02-09) 2 commits.
+  (merged to 'next' on 2009-10-11 at 81b8128)
+ + Refuse deleting the current branch via push
+ + Refuse updating the current branch in a non-bare repository via push
+
+--------------------------------------------------
+[I have been too busy to purge these]
+
+* ne/rev-cache (2009-10-19) 7 commits.
+ . support for commit grafts, slight change to general mechanism
+ . support for path name caching in rev-cache
+ . full integration of rev-cache into git, completed test suite
+ . administrative functions for rev-cache, start of integration into git
+ . support for non-commit object caching in rev-cache
+ . basic revision cache system, no integration or features
+ . man page and technical discussion for rev-cache
+
+The author indicated that there is another round coming.  Does not seem to
+pass the tests when merged to 'pu', so it has been ejected for now.
+
+* jc/log-tz (2009-03-03) 1 commit.
+ - Allow --date=local --date=other-format to work as expected
+
+Maybe some people care about this.  I dunno.
+
+* jc/mailinfo-remove-brackets (2009-07-15) 1 commit.
+ - mailinfo: -b option keeps [bracketed] strings that is not a [PATCH] marker
+
+Maybe some people care about this.  I dunno.
+
+* pb/gitweb-no-project-list (2009-11-06) 3 commits.
+ . gitweb: Polish the content tags support
+ . gitweb: Support for no project list on gitweb front page
+ . gitweb: Refactor project list routines
+
+I picked these up but didn't queue as Warthog9's comments made certain
+amount of sense to me.