Fix a typo in the rpm build instructions.
Merge pull request #1898 from arthurschreiber/patch-2

Fix a typo in the rpm build instructions.
futils: return GIT_ENOTFOUND when trying to read a directory

This lets the reference code return not-found when the user asks to
look up a reference when in fact they pass a namespace.
Merge pull request #1562 from libgit2/cmn/refs-namespace-lookup

Provide the user with a more useful error code when a looking up a reference which name points to a namepace
Rename diff objects and split patch.h

This makes no functional change to diff but renames a couple of
the objects and splits the new git_patch (formerly git_diff_patch)
into a new header file.
Diff API cleanup

This lays groundwork for separating formatting options from diff
creation options.  This groups the formatting flags separately
from the diff list creation flags and reorders the options.  This
also tweaks some APIs to further separate code that uses patches
from code that just looks at git_diffs.
tests for checkout index with conflicts
checkout (from index) can write conflicts
Prevent checkout_tree when conflicts exist, clear NAME on checkout tree

Prevent checkout tree when unresolved changes exist (unless FORCE flag
is specified).  Clear NAME table when checking out, to avoid
checkout_conflicts from attempting to manipulate it.  Ensure that NAME
is also cleared at reset.
checkout rename conflicts

rename conflict tests for checkout conflicts, don't suffix filenames
when checking out with USE_OURS or USE_THEIRS
Get rid of some quick hacks
Don't overwrite ~ files checking out conflicts

If a D/F conflict or rename 2->1 conflict occurs,
we write the file sides as filename~branchname.  If
a file with that name already exists in the working
directory, write as filename~branchname_0 instead.
(Incrementing 0 until a unique filename is found.)
Fix warning, fix memory leak
Honor UPDATE_ONLY bit when checking out conflicts
Two-step conflict checkout (load / perform)

Move conflict handling into two steps: load the conflicts and
then apply the conflicts.  This is more compatible with the
existing checkout implementation and makes progress reporting
more sane.
Move functions in checkout_conflicts to checkout.c

It seemed exceptionally silly to have a split there
where no split needed to be.
Move path prefixed help to path.h
Merge pull request #1702 from ethomson/checkout_merge

Checkout merge
slightly clarified the "license" portion of `README.md" + formatting all over

There are commercial open source applications, hence proprietary seems to be a better term.

Also:
 - Trimmed header `=`'s to match text length
 - made libgit2 stand out everywhere
 - pretty printing links
 - irc link for those with the correct setup
slightly clarified the "license" portion of `README.md" + formatting all over

added the second change suggested by @nulltoken (with two extra words :) )