It's been a while since I sent this the last time. We are nearing 1.5.3 final; I pulled gitk updates tonight, and expect git-gui updates to 0.8.0 over the weekend. There are a handful trivial fixes since 1.5.3-rc3. I am hoping one topic (bs/lock) to graduate from 'next' and another from nowhere (js/worktree) before 1.5.3-rc4, probably by mid next-week. ---------------------------------------------------------------- * The 'maint' branch has these fixes since the last announcement. Julian Phillips (1): Force listingblocks to be monospaced in manpages Junio C Hamano (1): Do not expect unlink(2) to fail on a directory. * The 'master' branch has these since the last announcement in addition to the above. Adam Roben (1): Add GIT_EDITOR environment and core.editor configuration variables Alex Riesen (1): Fix git-rebase -i to allow squashing of fast-forwardable commits Alexandre Julliard (2): git.el: Support for incremental status updates. git.el: Pass an explicit argument to enable smerge-mode. Brian Gernhardt (1): Document commit.template configuration variable. Carlos Rica (1): Rename read_pipe() with read_fd() and make its buffer nul-terminated. David Kastrup (2): contrib/emacs/Makefile: Also install .el files. Documentation/gitignore.txt: Fix the seriously misleading priority explanation Emil Medve (1): Use $(RM) in Makefiles instead of 'rm -f' Eric Wong (2): git-svn: remove leading slashes from fetch lines in the generate config git-svn: fix commiting renames over DAV with funky file names Francis Moreau (1): Fix git-branch documentation when using remote refs Greg KH (1): make git-send-email.perl handle email addresses with no names when Email::Valid is present Jakub Narebski (3): gitweb cleanup: Move @diff_opts declaration earlier gitweb: Fix support for legacy gitweb config for snapshots gitweb: More detailed error messages for snapshot format Jim Meyering (2): git-cvsserver: detect/diagnose write failure, etc. pretty-options.txt: tiny doc fix Johannes Schindelin (13): filter-branch: get rid of "set -e" rebase -i: call editor just once for a multi-squash fsck --lost-found: write blob's contents, not their SHA-1 mailinfo: fix 'fatal: cannot convert from utf-8 to utf-8' Shut "git rebase -i" up when no --verbose was given rebase -i: exchange all "if [ .. ]" by "if test .." filter-branch: Big syntax change; support rewriting multiple refs Teach revision machinery about --no-walk git log -g: Complain, but do not fail, when no reflogs are there Teach approxidate() to understand "never" git am: skip pine's internal folder data rebase -i: fix overzealous output redirection rebase -i: fix interrupted squashing Josh Triplett (1): Remove useless uses of cat, and replace with filename arguments Junio C Hamano (24): Make show_rfc2822_date() just another date output format. Wire new date formats to --date=<format> parser. Document new --date=<format> Add contrib/stats/mailmap.pl script Update .mailmap Documentation/git-commit-tree: remove description of a nonexistent limitation GIT v1.5.3-rc2 Update INSTALL Fix VISUAL/EDITOR preference order in Documentation/config.txt. Synonyms: -i == --regexp-ignore-case, -E == --extended-regexp Mark user-manual as UTF-8 user-manual: fix typolets. t9200: Be careful when checking CVS/Entries GIT 1.5.3-rc3 Make sure git-stash works from subdirectory. gitweb: fix broken snapshot git-submodule module_name: avoid using unwieldy "value_regexp" feature. git-submodule: remove redundant call to git-describe When locking in a symlinked repository, try to lock the original. git_mkstemp(): be careful not to overflow the path buffer. Update description of -z option. git-stash: do not remove a ref by hand. Fix git-stash apply --index git-stash apply --index: optimize postprocessing Kumar Gala (1): send-email: Update regex parsing for pine aliases Linus Torvalds (2): Do a better job at guessing unknown character sets Fix up duplicate parents removal Marco Costalba (1): Avoid to duplicate commit message when is not encoded Marius Storm-Olsen (1): Fix git-p4 on Windows to not use the Posix sysconf function. Mark Levedahl (1): gitk: Ignore ctrl-z as EOF on windows Matt McCutchen (1): gitweb: snapshot cleanups & support for offering multiple formats Matthieu Moy (1): More permissive "git-rm --cached" behavior without -f. Nanako Shiraishi (2): Document "git stash message..." git-stash: Make sure reflog is created for refs/stash Nguyễn Thái Ngọc Duy (1): git-write-tree should not crash if prefix does not exist Paul Mackerras (5): gitk: Fix bug introduced by previous commit gitk: Show changes in index and changes in working directory separately gitk: Make the fake commit for the index changes green rather than magenta gitk: Wait for the window to become visible after creating it gitk: Fix bugs in the Find function Peter Hagervall (1): Make every builtin-*.c file #include "builtin.h" René Scharfe (2): filter-branch: fix dash complaining about "Missing '))'" cleanup unpack-trees.c: shrink struct tree_entry_list Richard MUSIL (1): git-svn: Minimalistic patch which allows svn usernames with space(s). Robin Rosenberg (3): Support output ISO 8601 format dates cvsexportcommit: avoid racy CVS problem. Document --unified/-U option Scott Lamb (2): git-p4: use subprocess in p4CmdList git-p4: input to "p4 files" by stdin instead of arguments Sean Estabrooks (3): Remove "WITH_P4IMPORT" knob from the Makefile Remove p4 rpm from git.spec.in. Demote git-p4import to contrib status. Shawn O. Pearce (3): Correct trivial typo in fast-import documentation Teach fast-import to recursively copy files/directories gitk: Bind keyboard actions to the command key on Mac OS Simon Hausmann (4): git-p4: Cleanup, make listExistingP4Branches a global function for later use. git-p4: Fix upstream branch detection for submit/rebase with multiple branches. git-p4: Cleanup, used common function for listing imported p4 branches git-p4: Fix p4 user cache population on Windows. Stephen Rothwell (1): send-email: discard blank around address in extract_valid_address as well. Steven Grimm (2): Document how to tell git to not launch a pager Teach git-commit about commit message templates. Sven Verdoolaege (2): lockfile.c: schedule remove_lock_file only once. unpack-trees.c: assume submodules are clean during check-out - 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