Fix git pull behavior with multiple remotes
magit-rewrite-{set-commit-property,finish-step}: fix regressions

Make `magit-rewrite-set-commit-property' always return t so that the
`magit-section-action' hooks `magit-{apply,cherry-pick,revert}-hook'
run just the rewrite case, and not the default `commit' case too.

In `magit-rewrite-finish-step', do not use `magit-cherry-pick-commit'.
That function does a refresh before we had a chance to call
`magit-rewrite-set-commit-property'.  If cherry-picking a commit fails,
then say so.
Merge branch 'fix-rewrite'
Merge pull request #1294 from Silex/master

Fix git pull behavior with multiple remotes
add ability to undo last revert

Close #79.
Merge branch 'master' into next

Conflicts:
	magit.el
magit-git-standard-options: add -c core.preloadindex=true
magit-get-current-tag: avoid using --dirty

Don't use the Git `--dirty' argument unless the function argument
WITH-DISTANCE-P is the symbol `dirty'.  This makes `git tag' much faster
on file-systems that don't properly cache access times.  Inside Magit we
currently are not ever interested in knowing whether there is any dirt,
but some third-party code does (well, some of my local hacks, that is).
Merge branch 'mushroom'
Merge branch 'master' into next

Conflicts:
	magit.el
magit-get-{current,next}-tag: rename argument WITH-DISTANCE

Rename argument WITH-DISTANCE-P to WITH-DISTANCE.