fix magit-push-tags
magit-diff-highlight-whitespace: use lazy match
Lazy match should be used to find trailing spaces.
Merge pull request #1373 from shigi/trailing-spaces

magit-diff-highlight-whitespace: use lazy match
magit-git-executable: except on windows, use just the name

Since f0186c88732e543d9487082405685fa0a2688b70 `magit-git-executable'
was set to the full path to the executable, which becomes problematic
when connecting to a remote repository using Tramp and the executable
is not installed in the identical location on that system.

On Windows keep using the full path, because here multiple "git.***"
are installed and it makes a big difference which is used.  I would
much rather have a handful of Windows users report that they cannot
use Magit remotely than to have many more users complain that "Magit
is nice, but soooooooo slow on Windows".

We could use different variable for local and tramp Git, I suppose.
But the proper way of testing that is `file-remote-p', and that is
to expensive to run over and over again.  And I don't like caching.
deal with yet another way Emacs can be installed on OS X
Merge branch 'master' into next

Conflicts:
	magit.el
magit-commit-assert: don't offer to stage if MERGE_MSG exists

Because doing so would likely mean staging unresolved conflicts.
magit-diff-toggle-refine-hunk: cosmetics
remove option magit-use-overlays

Make `magit-insert' and `magit-put-face-property' always use overlays.
Previously it was possible to use text properties which theoretically
gives a small performance boast.  But the option to do the latter was
more confusing than helpful and I doubt that anybody actually made use
of it, especially because doing so would force the use of something
other than the background color for highlighting the current section.
remove option magit-section-highlight-face

This option served to purposes:

It allowed disabling highlighting of the current section.  The ability
to do this was added because of performance considerations, not as an
aesthetic choice.  The effect on performance is not noticeable and so
it is okay to drop support for this.  It is still possible to have the
visual effect of not highlighting the current section by unsetting all
face properties or setting these property to the same value it has in
the `default' face.

Once a theme has set a face property it is not possible for user to
unset that property again, she can just change it to something else,
but not nothing.  This was a problem until recently, but now this can
be worked around by setting that property to the same value it has in
the `default' face.
rearrange section utilities

Create just one section "Section Utilities" by absorbing the directly
preceding, one-definition section "Section Utilities" and moving some of
the definitions previously in "Section Actions" here.  The latter is the
reason we are doing this; we have to move these things up so that we can
use the `magit-section-case' macro in code which is defined earlier than
where it used to be defined.  The `magit-{*}-at-point' functions are
moved elsewhere, putting them below "Section Api" was a mistake in the
first place.
add faces magit-diffstat-{added,removed}
remove faces magit-{log-message,signature-none}
compress face definitions
rearrange face definitions
use lowercase and CamelCase color names

For color names that consist of a single word use lowercase.
For color names that consist of multiple words use CamelCase.
rename faces magit{-diff => }-{file,hunk}-head{er => ing}

Rename `magit-diff-file-header' to `magit-file-heading', and
rename `magit-diff-hunk-header' to `magit-hunk-heading'.

Drop the "diff" from the name of "file" face because it is also used
outside of diffs, i.e. for untracked files.  Drop it from the name of
the "hunk" face too for consistency.

Replace "header" with "heading" because we only use the term "header"
for those one-line headers that appear at the top of some buffers.  For
the part of a section that remains visible even in collapsed state we
use "heading".  Consistently using distinct terms helps avoid confusion.
magit-file-heading: cosmetics
add face magit-conflict-heading, replacing magit-diff-merge-{*}
use magit-diff-file-heading only for text, not complete line

For most headings the heading face is only used for the actual text but
not for the following newline.  This makes a difference when the
background color is set for the heading face.

For hunk headings we also propertize the newline and by default also set
the background color, which makes diffs more readable because this
clearly separates different hunks from one another.

Until now we also did that for files because a diff may contain several
files and separating them clearly makes sense the same way it does for
hunks.  We did not actually set the background color by default, but
users who wanted to visually separate files the same way that hunks are,
just had to do so.

However if the background color actually is specified and spans the hole
line then the region is not visible when selecting multiple files.  This
would be very confusing so remove the ability to set the background for
the complete file heading line.