Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The second batch of topics, all of which have been cooking for quite
a while on the 'next' branch, have been merged to 'master'.
I am aware of a handful of multi-patch topics sent to the list the
past week that have not been picked up, and I won't be picking them
up yet, before we have a chance to first have some topics that have
been cooking in 'next' during the previous cycle merged to 'master'
and then rewind the tip of 'next'. At that point, I may have to ask
for them to be rebased on top of the updated 'master' to reduce
conflicts. Thanks for your patience.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--
[Graduated to master]
* bc/blame-crlf-test (2014-05-08) 1 commit
(merged to 'next' on 2014-05-14 at b819505)
+ blame: correctly handle files regardless of autocrlf
If a file contained CRLF line endings in a repository with
core.autocrlf=input, then blame always marked lines as Not
Committed Yet, even if they were unmodified.
* da/imap-send-use-credential-helper (2014-04-29) 1 commit
(merged to 'next' on 2014-05-12 at b0698a5)
+ imap-send: use git-credential
git imap-send learned to ask the credential helper for
authentication material.
* dk/blame-reorg (2014-04-28) 1 commit
(merged to 'next' on 2014-05-14 at 354a0e3)
+ blame: large-scale performance rewrite
git blame has been optimized greatly by reorganising the data
structure that is used to keep track of the work to be done, thanks
to David Karstrup d...@gnu.org.
* dk/raise-core-deltabasecachelimit (2014-05-06) 1 commit
(merged to 'next' on 2014-05-12 at 97ec92a)
+ Bump core.deltaBaseCacheLimit to 96m
The `core.deltabasecachelimit` used to default to 16 MiB, but this
proved to be too small, and has been bumped to 96 MiB.
* dt/merge-recursive-case-insensitive (2014-05-08) 2 commits
(merged to 'next' on 2014-05-12 at 820d524)
+ mv: allow renaming to fix case on case insensitive filesystems
+ merge-recursive.c: fix case-changing merge bug
On a case insensitive filesystem, merge-recursive incorrectly
deleted the file that is to be renamed to a name that is the same
except for case differences.
* ep/shell-assign-and-export-vars (2014-05-23) 2 commits
(merged to 'next' on 2014-05-23 at 7699c0e)
+ scripts: more export VAR=VALUE fixes
+ scripts: export VAR=VALUE construct is not portable
* fc/status-printf-squelch-format-zero-length-warnings (2014-05-07) 1 commit
(merged to 'next' on 2014-05-12 at 6b04e23)
+ silence a bunch of format-zero-length warnings
* jc/coding-guidelines (2014-05-20) 9 commits
(merged to 'next' on 2014-05-23 at bb351fc)
+ CodingGuidelines: avoid test cond -a/-o cond
(merged to 'next' on 2014-05-12 at e1fcf62)
+ CodingGuidelines: on splitting a long line
+ CodingGuidelines: on comparison
+ CodingGuidelines: do not call the conditional statement if()
+ CodingGuidelines: give an example for shell function preamble
+ CodingGuidelines: give an example for control statements
+ CodingGuidelines: give an example for redirection
+ CodingGuidelines: give an example for case/esac statement
+ CodingGuidelines: once it is in, it is not worth the code churn
Some people need these things spelled out, unable to follow advices
given by others when they fail to imitate the surrounding existing
code.
* jd/subtree (2014-05-13) 6 commits
(merged to 'next' on 2014-05-14 at 977db74)
+ contrib/subtree: allow adding an annotated tag
(merged to 'next' on 2014-05-07 at 81b375d)
+ contrib/subtree/Makefile: clean up rule for clean
+ contrib/subtree/Makefile: clean up rules to generate documentation
+ contrib/subtree/Makefile: s/libexecdir/gitexecdir/
+ contrib/subtree/Makefile: use GIT-VERSION-FILE
+ contrib/subtree/Makefile: scrap unused $(gitdir)
Clean-up build procedure of subtree in contrib/.
* je/pager-do-not-recurse (2014-04-28) 1 commit
(merged to 'next' on 2014-05-12 at 32de470)
+ pager: do allow spawning pager recursively
We used to unconditionally disable the pager in the pager process
we spawn to feed out output, but that prevented people who want to
run less within less from doing so.
* jj/command-line-adjective (2014-05-21) 1 commit
(merged to 'next' on 2014-05-23 at fe136c8)
+ Documentation: use command-line when used as a compound adjective, and fix
other minor grammatical issues
* jk/commit-C-pick-empty (2014-04-28) 1 commit
(merged to 'next' on 2014-05-12 at c187e1e)
+ commit: do not complain of empty messages from -C
git commit --allow-empty-message -C $commit did not work when the
commit did not have any log message.
* jk/grep-tell-run-command-to-cd-when-running-pager (2014-05-07) 1 commit
(merged to 'next' on