Fix magit-key-mode.el to refer to magit-diff-toggle-refine-hunk
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
magit-log-goto-same-section: fix pasto
magit-log-goto-same-commit: cosmetics
magit-insert-wazzup-cherries: use magit-git-wash, add to parent
keep delayed text insertion from messing up section boundaries
magit-git-wash: pass arguments to washer too

Pass the arguments to git that are used to insert the text also to the
function that washes that output.  It helps those functions to know what
exactly they are supposed to wash.

In one case (washing cherries) we start taking advantage of this now.
magit-wash-diff: fix to bugs related to unmerged files

Make sure we return non-nil, otherwise subsequent diffs would not be
washed (including, but not limited to the diff about the same file as
the "unmerged" line).

In the status buffer, only remove the duplicated "unmerged" line, not
the original too.
magit-insert-rebase-sequence: cosmetics
Merge branch 'master' into next

Conflicts:
	magit-key-mode.el