Stabilization cycle towards -rc2 continues. The main point of -rc cycle is regression fixes and general bugfixes, although a few new features managed to slip in. - diff.external configuration variable serves the same purpose as GIT_EXTERNAL_DIFF environment; - "git diff --src-prefix=l/ --dst-prefix=k/" can be used to change the usual prefix (i.e. a/foo vs. b/foo). ---------------------------------------------------------------- * The 'maint' branch has these fixes since the last announcement. Jeff King (2): clone: correctly report http_fetch errors git-send-email: avoid duplicate message-ids * The 'master' branch has these since the last announcement in addition to the above. Charles Bailey (2): Fix git-instaweb breakage on MacOS X due to the limited sed functionality Remove old generated files from .gitignore. Eric Wong (3): git-svn: avoid leaving leftover committer/author info in rebase git-svn: workaround a for broken symlinks in SVN git-svn: avoid warning when run without arguments Finn Arne Gangstad (1): Improved submodule merge support Gustaf Hendeby (1): Make git send-email accept $EDITOR with arguments H.Merijn Brand (1): the use of 'tr' in the test suite isn't really portable Jakub Narebski (1): gitweb: fix whitespace in config_to_multi (indent with tab) Jeff King (2): test "git clone -o" clean up 1.5.4 release notes Jim Meyering (2): git-filter-branch.sh: more portable tr usage: use \012, not \n. Don't dereference NULL upon lookup failure. Johannes Schindelin (6): Support config variable diff.external Document diff.external and mergetool.<tool>.path rebase -p -i: handle "no changes" gracefully git show <tag>: show the tagger Teach diff machinery to display other prefixes than "a/" and "b/" Mention git-shell's "cvs" substitution in the RelNotes Johannes Sixt (3): Plug a resource leak in threaded pack-objects code. Clean up documentation that references deprecated 'git peek-remote'. filter-branch: Remove broken and unnecessary summary of rewritten refs. Junio C Hamano (8): builtin-blame.c: remove unneeded memclr() GIT 1.5.4-rc1 t4024: fix test script to use simpler sed pattern fix git commit --amend -m "new message" shell-scripts usage(): consistently exit with non-zero Documentation: ls-files -v is about "assume unchanged". Fix $EDITOR regression introduced by rewrite in C. Documentation: describe 'union' low-level merge driver Linus Torvalds (2): unpack-trees: FLEX_ARRAY fix Re(-re)*fix trim_common_tail() Marco Roeland (1): clone: fix options '-o' and '--origin' to be recognised again Miklos Vajna (1): everyday: replace 'prune' and 'repack' with 'gc' Nicolas Pitre (2): fix style of a few comments in diff-delta.c make 'git describe --all --contains' work Pierre Habouzit (4): Fix segfault in diff-delta.c when FLEX_ARRAY is 1 git-tag: fix -l switch handling regression. Force the sticked form for options with optional arguments. parse-options: Add a gitcli(5) man page. Ralf Wildenhues (1): Fix some documentation typos. Sam Vilain (1): Clarify error response from 'git fetch' for bad responses Sean Estabrooks (1): Fix interactive rebase to preserve author email address Shawn O. Pearce (3): Avoid update hook during git-rebase --interactive Catch and handle git-commit failures in git-rebase --interactive Reallow git-rebase --interactive --continue if commit is unnecessary Stefan Sperling (1): Small comment fix for git-cvsimport. Wincent Colaiuta (1): Emit helpful status for accidental "git stash" save - 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
