git, branch v2.6.4

Git 2.6.4

2015-12-08T22:12:45Z

Signed-off-by: Junio C Hamano

Merge branch 'rs/status-detached-head-memcmp' into maint

2015-12-08T22:11:32Z

Fix some string-matching corner cases when digging in the reflog for "git status". * rs/status-detached-head-memcmp: wt-status: correct and simplify check for detached HEAD

Merge branch 'ad/sha1-update-chunked' into maint

2015-12-08T22:05:03Z

Apple's common crypto implementation of SHA1_Update() does not take more than 4GB at a time, and we now have a compile-time workaround for it. * ad/sha1-update-chunked: sha1: allow limiting the size of the data passed to SHA1_Update() sha1: provide another level of indirection for the SHA-1 functions

Merge branch 'sg/bash-prompt-dirty-orphan' into maint

2015-12-08T22:05:02Z

Produce correct "dirty" marker for shell prompts, even when we are on an orphan or an unborn branch. * sg/bash-prompt-dirty-orphan: bash prompt: indicate dirty index even on orphan branches bash prompt: remove a redundant 'git diff' option bash prompt: test dirty index and worktree while on an orphan branch

Merge branch 'jk/interpret-trailers-outside-a-repository' into maint

2015-12-08T22:05:02Z

Allow "git interpret-trailers" to run outside of a Git repository. * jk/interpret-trailers-outside-a-repository: interpret-trailers: allow running outside a repository

Merge branch 'jk/rebase-no-autostash' into maint

2015-12-08T22:05:01Z

There was no way to defeat a configured rebase.autostash variable from the command line, as "git rebase --no-autostash" was missing. * jk/rebase-no-autostash: Documentation/git-rebase: fix --no-autostash formatting rebase: support --no-autostash

Prepare for 2.6.4

2015-12-04T19:39:19Z

Signed-off-by: Junio C Hamano

Merge branch 'da/difftool' into maint

2015-12-04T19:34:24Z

The code to prepare the working tree side of temporary directory for the "dir-diff" feature forgot that symbolic links need not be copied (or symlinked) to the temporary area, as the code already special cases and overwrites them. Besides, it was wrong to try computing the object name of the target of symbolic link, which may not even exist or may be a directory. * da/difftool: difftool: ignore symbolic links in use_wt_file

Merge branch 'dk/gc-idx-wo-pack' into maint

2015-12-04T19:33:08Z

Having a leftover .idx file without corresponding .pack file in the repository hurts performance; "git gc" learned to prune them. We may want to do the same for .bitmap (and notice but not prune .keep) without corresponding .pack, but that can be a separate topic. * dk/gc-idx-wo-pack: gc: remove garbage .idx files from pack dir t5304: test cleaning pack garbage prepare_packed_git(): refactor garbage reporting in pack directory

Merge branch 'eg/p4-submit-catch-failure' into maint

2015-12-01T22:24:21Z

Just like the working tree is cleaned up when the user cancelled submission in P4Submit.applyCommit(), clean up the mess if "p4 submit" fails. * eg/p4-submit-catch-failure: git-p4: clean up after p4 submit failure