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.
Caution. "next" has been rebuilt with the remaining topics on top of
"master". "maint" is still for 1.5.4.X maintenance track for tonight.
A rough timeline from now on.
* Brown paper back fixes, if any, for 1.5.5.1 (2008-04-16).
* Discussion and review on new feature and enhancement patch series
begins. Please resubmit things that you were cooking in your head
during 1.5.5-rc period after cleaning up and retesting.
* 1.5.6 merge window closes (2008-05-14).
* Fixes of 'master' continues; 1.5.6-rc0 gets tagged (2008-05-21).
* 1.5.6 Final (2008-06-08).
----------------------------------------------------------------
[New Topics]
* sg/merge-options (Sun Apr 6 03:23:47 2008 +0200) 6 commits
- merge: remove deprecated summary and diffstat options and config
variables
- merge, pull: add '--(no-)log' command line option
- fmt-merge-msg: add '--(no-)log' options and 'merge.log' config
variable
- add 'merge.stat' config variable
- merge, pull: introduce '--(no-)stat' option
- doc: moved merge.* config variables into separate merge-config.txt
I tried to fix its too-eager deprecation. The last one needs re-review;
it should remove "these are still supported but will be removed" comments
that earlier ones add, and must be held back until 1.6.0 or later.
* jc/blame (Wed Apr 2 22:17:53 2008 -0700) 5 commits
- git-blame --reverse
- builtin-blame.c: allow more than 16 parents
- builtin-blame.c: move prepare_final() into a separate function.
- rev-list --children
- revision traversal: --children option
The reverse blame I talked about earlier.
* jc/lstat (Sun Mar 30 12:39:25 2008 -0700) 3 commits
- diff-files: mark an index entry we know is up-to-date as such
- write_index(): optimize ce_smudge_racily_clean_entry() calls with
CE_UPTODATE
...
