By the end of this week, we will hopefully pretty much know what
will be (and what won't be) in 1.5.5. Tonight's 'master'
contains Linus's "diff --dirstat" and my "apply ---whitespace"
enhancements, among other things. The next 'master' update is
expected to be fairly big (see "What's cooking").
----------------------------------------------------------------
* The 'maint' branch has these fixes since v1.5.4.3
Shawn O. Pearce (3):
Ensure 'make dist' compiles git-archive.exe on Cygwin
Protect peel_ref fallback case from NULL parse_object result
Correct fast-export file mode strings to match fast-import standard
----------------------------------------------------------------
* The 'master' branch has these since the last announcement
in addition to the above.
Gerrit Pape (2):
git-merge-index documentation: clarify synopsis
builtin-tag.c: remove cruft
Jakub Narebski (1):
gitweb: Fix bugs in git_search_grep_body: it's length(), not len()
Jay Soffian (2):
send-email: fix In-Reply-To regression
pull: pass --strategy along to to rebase
Jeff King (5):
git_config_*: don't assume we are parsing a config file
t3404: use configured shell instead of /bin/sh
diff: fix java funcname pattern for solaris
t9001: enhance fake sendmail test harness
send-email: test compose functionality
Johannes Sixt (1):
prefix_path: use is_absolute_path() instead of *orig == '/'
Junio C Hamano (18):
builtin-apply.c: refactor small part that matches context
builtin-apply.c: restructure "offset" matching
builtin-apply.c: push match-beginning/end logic down
builtin-apply.c: make it more line oriented
builtin-apply.c: optimize match_beginning/end processing a bit.
builtin-apply.c: mark common context lines in lineinfo structure.
builtin-apply.c: clean-up apply_one_fragment()
builtin-apply.c: simplify calling site to apply_line()
builtin-apply.c: do not feed copy_wsfix() leading '+'
builtin-apply.c: move copy_wsfix() function a bit higher.
builtin-apply.c: pass ws_rule down to match_fragment()
git-apply --whitespace=fix: fix whitespace fuzz introduced by previous
run
core.whitespace: cr-at-eol
apply: do not barf on patch with too large an offset
git-reset --hard and git-read-tree --reset: fix read_cache_unmerged()
gitweb: Better chopping in commit search results
ws_fix_copy(): move the whitespace fixing function to ws.c
diff --dirstat: saner handling of binary and unmerged files
Linus Torvalds (5):
Add "--dirstat" for some directory statistics
Fix name re-hashing semantics
Name hash fixups: export (and rename) remove_hash_entry
Use helper function for copying index entry information
Be more verbose when checkout takes a long time
Michele Ballabio (1):
builtin-for-each-ref.c: fix typo in error message
Miklos Vajna (1):
git-clean: handle errors if removing files fails
Santi Béjar (1):
git-bundle.txt: Add different strategies to create the bundle
Shawn O. Pearce (1):
Teach git-grep --name-only as synonym for -l
-
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
