git/builtin, branch v2.6.3

Merge branch 'js/misc-fixes' into maint

2015-11-05T20:18:13Z

Various compilation fixes and squelching of warnings. * js/misc-fixes: Correct fscanf formatting string for I64u values Silence GCC's "cast of pointer to integer of a different size" warning Squelch warning about an integer overflow

Merge branch 'jc/add-u-A-default-to-top' into maint

2015-11-05T20:18:12Z

"git --literal-pathspecs add -u/-A" without any command line argument misbehaved ever since Git 2.0. * jc/add-u-A-default-to-top: add: simplify -u/-A without pathspec

Merge branch 'nd/clone-linked-checkout' into maint

2015-11-05T20:18:08Z

It was not possible to use a repository-lookalike created by "git worktree add" as a local source of "git clone". * nd/clone-linked-checkout: clone: better error when --reference is a linked checkout clone: allow --local from a linked checkout enter_repo: allow .git files in strict mode enter_repo: avoid duplicating logic, use is_git_directory() instead t0002: add test for enter_repo(), non-strict mode path.c: delete an extra space

Merge branch 'es/worktree-add' into maint

2015-11-04T22:20:44Z

* es/worktree-add: worktree: usage: denote as optional with 'add'

Merge branch 'mk/blame-error-message' into maint

2015-11-03T23:32:43Z

The error message from "git blame --contents --reverse" incorrectly talked about "--contents --children". * mk/blame-error-message: blame: fix option name in error message

Merge branch 'jk/merge-file-exit-code' into maint

2015-11-03T23:32:41Z

"git merge-file" tried to signal how many conflicts it found, which obviously would not work well when there are too many of them. * jk/merge-file-exit-code: merge-file: clamp exit code to maximum 127

Merge branch 'jc/am-3-fallback-regression-fix' into maint

2015-11-03T23:32:39Z

"git am -3" had a small regression where it is aborted in its error handling codepath when underlying merge-recursive failed in certain ways, as it assumed that the internal call to merge-recursive will never die, which is not the case (yet). * jc/am-3-fallback-regression-fix: am -3: do not let failed merge from completing the error codepath

Merge branch 'jc/usage-stdin' into maint

2015-11-03T23:32:38Z

The synopsis text and the usage string of subcommands that read list of things from the standard input are often shown as if they only take input from a file on a filesystem, which was misleading. * jc/usage-stdin: usage: do not insist that standard input must come from a file

Merge branch 'rt/placeholder-in-usage' into maint

2015-11-03T23:32:37Z

A couple of commands still showed "[options]" in their usage string to note where options should come on their command line, but we spell that "[]" in most places these days. * rt/placeholder-in-usage: am, credential-cache: add angle brackets to usage string

Merge branch 'nd/gc-auto-background-fix' into maint

2015-11-03T23:32:33Z

When "git gc --auto" is backgrounded, its diagnosis message is lost. Save it to a file in $GIT_DIR and show it next time the "gc --auto" is run. * nd/gc-auto-background-fix: gc: save log from daemonized gc --auto and print it next time