Fix const-correctness of git_patch_get_delta, git_patch_num_hunks, git_patch_num_lines_in_hunk
Correct C90 warnings
Merge pull request #2262 from libgit2/rb/fix-ignore-pop

Fix bug popping ignore files during wd iteration
Introduce git_merge__extract_conflict_paths
Added cherry-pick support
Added cherry pick tests
Capture conflict information in MERGE_MSG for revert and merge
Merge pull request #2264 from jacquesg/fix-warnings

Correct C90 warnings
Fix core.excludesfile named .gitignore

Ignore rules with slashes in them are matched using FNM_PATHNAME
and use the path to the .gitignore file from the root of the
repository along with the path fragment (including slashes) in
the ignore file itself.  Unfortunately, the relative path to the
.gitignore file was being applied to the global core.excludesfile
if that was also named ".gitignore".

This fixes that with more precise matching and includes test for
ignore rules with leading slashes (which were the primary example
of this being broken in the real world).

This also backports an improvement to the file context logic from
the threadsafe-iterators branch where we don't rely on mutating
the key of the attribute file name to generate the context path.
Added git_diff_stats test files
Introduce git_diff_get_stats, git_diff_stats_files_changed, git_diff_stats_insertions, git_diff_stats_deletions and git_diff_stats_to_buf
Introduce git_diff_format_email and git_diff_commit_as_email
Sanitize git_diff_format_email_options' summary parameter

It will form part of the subject line and should thus be one line.
Added a test case for formatting a binary patch e-mail
Merge pull request #2235 from jacquesg/cherry-pick

Add cherry pick support
Merge pull request #2269 from libgit2/rb/fix-leading-slash-ignores

Fix core.excludesfile named .gitignore
Add GIT_BRANCH_ALL to git_branch_t enum

git_branch_t is an enum so requesting GIT_BRANCH_LOCAL | GIT_BRANCH_REMOTE is not possible as it is not a member of the enum (at least VS2013 C++ complains about it).

This fixes a regression introduced in commit a667ca8298193b3103c1dbdcb1f6c527e6e99eb2 (PR #1946).

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Merge pull request #2270 from csware/fix_git_branch_t_enum

Add GIT_BRANCH_LOCAL_AND_REMOTE to git_branch_t enum
Merge pull request #2261 from jacquesg/format-patch

Support for format-patch
Some vector utility tweaks

This is just laying some groundwork for internal index changes
that I'm working on.