We still have remaining fixes and a handful backports (cherry-picks) from
'master' to 'maint', and we would probably need v1.5.4.5 shortly.
On the 'master' front, we have git-gui updates, more bash completion, and
a few recent graduates (rewrite of unpack_trees(), reimplementation of
git-remote).
----------------------------------------------------------------
* The 'maint' branch has these fixes since the last announcement.
Andy Whitcroft (1):
shortlog: take the first populated line of the description
Clemens Buchacher (1):
merge-recursive: handle file mode changes
Jakub Narebski (1):
gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
Jeff King (1):
t0021: tr portability fix for Solaris
Johannes Schindelin (3):
launch_editor(): allow spaces in the filename
git fetch: Take '-n' to mean '--no-tags'
merge-file: handle empty files gracefully
Junio C Hamano (3):
filter-branch: handle "disappearing tree" case correctly in subdir filter
git-pull documentation: warn about the option order
quiltimport: fix misquoting of parsed -p<num> parameter
Marc-Andre Lureau (2):
git-svn: fix find-rev error message when missing arg
git-cvsimport: fix merging with remote parent branch
Mike Hommey (1):
git rebase --abort: always restore the right commit
Pierre Habouzit (1):
git-quiltimport: better parser to grok "enhanced" series files.
Vineet Kumar (1):
Minor wording changes in the keyboard descriptions in git-add
--interactive.
----------------------------------------------------------------
* The 'master' branch has these since the last announcement
in addition to the above.
Adam Piątyszek (1):
git-gui: Add option for changing the width of the commit message text box
Christian Couder (2):
web--browse: use custom commands defined at config time
Documention: web--browse: add info about "browser.<tool>.cmd" config var
Johannes Schindelin (9):
path-list: add functions to work with unsorted lists
parseopt: add flag to stop on first non option
Test "git remote show" and "git remote prune"
Make git-remote a builtin
builtin-remote: prune remotes correctly that were added with --mirror
remote show: Clean up connection correctly if object fetch wasn't done
remote: fix "update [group...]"
builtin remote rm: remove symbolic refs, too
gc: call "prune --expire 2.weeks.ago" by default
Junio C Hamano (6):
merge-recursive: split low-level merge functions out.
expose a helper function peel_to_type().
traverse_trees_recursive(): propagate merge errors up
git-gui: Simplify MSGFMT setting in Makefile
Documentation/config: typofix
read-tree() and unpack_trees(): use consistent limit
Kevin Ballard (1):
bash: Properly quote the GIT_DIR at all times to fix subdirectory paths
with spaces
Linus Torvalds (11):
Add 'df_name_compare()' helper function
Make 'traverse_tree()' use linked structure rather than 'const char
*base'
Add return value to 'traverse_tree()' callback
Make 'traverse_trees()' traverse conflicting DF entries in parallel
Move 'unpack_trees()' over to 'traverse_trees()' interface
Fix tree-walking compare_entry() in the presense of --prefix
Add 'const' where appropriate to index handling functions
Make 'unpack_trees()' take the index to work on as an argument
Make 'unpack_trees()' have a separate source and destination index
unpack_trees(): minor memory leak fix in unused destination index
unpack_trees(): fix diff-index regression.
Michal Rokos (1):
autoconf: Test FREAD_READS_DIRECTORIES
Nicolas Pitre (1):
pack-objects: proper pack time stamping with --max-pack-size
Philipp A. Hartmann (1):
git-gui: if a background colour is set, set foreground colour as well
SZEDER Gábor (7):
bash: remove unnecessary conditions when checking for subcommands
bash: refactor searching for subcommands on the command line
bash: add new 'git stash' subcommands
bash: add 'git svn' subcommands and options
bash: use __gitdir when completing 'git rebase' options
bash: fix long option with argument double completion
update 'git rebase' documentation
Samuel Tardieu (1):
"remote update": print remote name being fetched from
Shawn O. Pearce (1):
bash: Remove completion of core.legacyheaders option
Teemu Likonen (1):
bash: Add more long options to be completed with "git --<TAB>"
eric miao (1):
git-gui: translate the remaining messages in zh_cn.po to chinese
--
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
