Merge pull request #1308 from dachary/wip-c-c-c-a

The C-c C-a binding in the change description is for Ack
proofread the submodule section

Signed-off-by: Loic Dachary <loic@dachary.org>
magit-commit-add-log: bugfix

As suggested by Daniel Dehennin in #1309.
Merge pull request #1310 from dachary/wip-submodules

proofread the submodule section
Make interactive form return a list for magit-init.
Fix quoting for default-value

The argument to default-value needs to be quoted
magit-rewrite-pending-diff: new function

This is a substitute for `magit-insert-pending-changes'.  The latter was
problematic because its implementation has not kept up with improvements
elsewhere.  I.e. the section it inserted was initially expanded and
worse when the user did collapse it, it kept being re-expanded on every
refresh.

Unfortunately there is no easy fix.  The only place where we can
currently prevent a diff from being expanded is in the "raw diff
washing" code.  The pending changes section, unlike staged and unstaged,
does not use raw washing.  It would be a major undertaking to teach the
raw washing how to deal with pending changes.  I don't want to do that
especially because having an additional raw washing cycle is a mistake
itself, which I have already fixed on the `next' branch.
Merge pull request #1315 from treese/fix-init

Make interactive form return a list for magit-init.
Merge pull request #1316 from lunaryorn/patch-1

Fix quoting for default-value
magit-wash-branch: deal with remote names that have the same prefix

Close #1319.
sanitize some faces

Remove the face `magit-header' instead make `magit-section-title'
inherit from `header-line' directly, without the redirection through
`magit-header'.

The removed face was described as "Many Magit faces inherit from this
one by default", but for those faces that are *not* used by "headers"
aka "titles", doing so was wrong.  So do *not* change those faces to
inherit from `magit-section-title' and instead use the same colors as
for the respective `magit-log-head-label-*' faces, but don't put a
`:box' around them.

There is more wrong with these and other faces, but that will be
fixed later.
magit-emacsclient-executable: try more version suffixed names
Fix magit-key-mode.el to refer to magit-diff-toggle-refine-hunk
add support for using unicode characters when drawing log graphs

Add new function `magit-log-format-unicode-graph' and add it as a
choice in option `magit-log-format-graph-function'.  Also add new
option `magit-log-format-unicode-graph-alist' allowing users to
choose the characters (unicode or not, actually) to be used.
Merge pull request #1326 from jwiegley/master

Fix magit-key-mode.el to refer to magit-diff-toggle-refine-hunk
Transition machinery for magit-insert-pending-changes

If users have customized their `magit-status-sections-hook' then it can
be confusing when they update magit and suddenly start getting error
messages due to `magit-insert-pending-changes' not being defined
anymore. Define a an obsolete function alias to a shim function that
displays a message to the user about what's going on.

See also: 382351845eca2425713f640f9bb55756c9ddf723
Merge pull request #1328 from mgalgs/obsolete-alias

Transition machinery for magit-insert-pending-changes
Don't try to run magit-rewrite-diff-pending from magit-status-sections-hook

In [9a4e236: "Transition machinery for magit-insert-pending-changes"] an
obsolete function alias and "transition" function were introduced to
help users that may have customized `magit-status-sections-hook' to know
that `magit-rewrite-diff-pending' no longer exists. However, it really
never makes sense to run `magit-rewrite-diff-pending' from
`magit-status-sections-hook' and in some configurations the actual
"help" message is hidden by the error from
magit-rewrite-diff-pending. Fix this unnecessary confusion by *not*
running `magit-rewrite-diff-pending' from the shim function.
Merge pull request #1331 from mgalgs/rewrite-diff-pending-stuff

Don't try to run magit-rewrite-diff-pending from magit-status-sections-hook
add --strategy-option=

Signed-off-by: Loic Dachary <loic@dachary.org>