git, branch v2.3.1

Git 2.3.1

2015-02-25T06:14:42Z

Signed-off-by: Junio C Hamano

Merge branch 'ak/add-i-empty-candidates' into maint

2015-02-25T06:10:42Z

The interactive "show a list and let the user choose from it" interface "add -i" used showed and prompted to the user even when the candidate list was empty, against which the only "choice" the user could have made was to choose nothing. * ak/add-i-empty-candidates: add -i: return from list_and_choose if there is no candidate

Merge branch 'jc/apply-ws-fix-expands' into maint

2015-02-25T06:10:41Z

"git apply --whitespace=fix" used to under-allocate the memory when the fix resulted in a longer text than the original patch. * jc/apply-ws-fix-expands: apply: count the size of postimage correctly apply: make update_pre_post_images() sanity check the given postlen apply.c: typofix

Merge branch 'jc/doc-log-rev-list-options' into maint

2015-02-25T06:10:40Z

"git log --help" used to show rev-list options that are irrelevant to the "log" command. * jc/doc-log-rev-list-options: Documentation: what does "git log --indexed-objects" even mean?

Merge branch 'mg/commit-author-no-match-malformed-message' into maint

2015-02-25T06:10:38Z

The error message from "git commit", when a non-existing author name was given as value to the "--author=" parameter, has been reworded to avoid misunderstanding. * mg/commit-author-no-match-malformed-message: commit: reword --author error message

Merge branch 'jk/dumb-http-idx-fetch-fix' into maint

2015-02-25T06:10:37Z

A broken pack .idx file in the receiving repository prevented the dumb http transport from fetching a good copy of it from the other side. * jk/dumb-http-idx-fetch-fix: dumb-http: do not pass NULL path to parse_pack_index

Merge branch 'jc/diff-format-doc' into maint

2015-02-25T06:10:36Z

The documentation incorrectly said that C(opy) and R(ename) are the only ones that can be followed by the score number in the output in the --raw format. * jc/diff-format-doc: diff-format doc: a score can follow M for rewrite

Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint

2015-02-25T06:10:35Z

Fix a misspelled conditional that is always true. * jk/remote-curl-an-array-in-struct-cannot-be-null: do not check truth value of flex arrays

Merge branch 'jk/status-read-branch-name-fix' into maint

2015-02-25T06:10:22Z

Code to read branch name from various files in .git/ directory would have misbehaved if the code to write them left an empty file. * jk/status-read-branch-name-fix: read_and_strip_branch: fix typo'd address-of operator

Merge branch 'mg/push-repo-option-doc' into maint

2015-02-25T06:10:19Z

The "git push" documentation made the "--repo=" option easily misunderstood. * mg/push-repo-option-doc: git-push.txt: document the behavior of --repo