Whitespace fix on staging/unstaging all files.

`yes-or-no-p` requires a trailing space on the string passed in,
otherwise you end up with "Stage all changes?(yes or no)".
Merge pull request #1156 from Wilfred/master

Whitespace fix on staging/unstaging all files.
magit-log-format-reflog: better align

Take the length of "rebase -i finish" into account when aligning.
magit-status-show-sequence-help: new option

Most of us know how to continue a rebase or finish a conflicting merge,
so we don't need to be constantly reminded.  But for beginners that is
not so.
magit.texi: use @uref for urls

Also add a @magit macro for extra convenience.
magit-show-diffstat: fix doc-string typo
set :package-version for custom options

For the appropriate custom options set the `:package-version' keyword,
using "2.0.0" as the version.  Replace some occurrences of the "1.3.0"
version; there never was such a release, and that won't change.

Always make `:package-version' the first keyword.
consistently order keywords in `defcustom's

The order is
`:package-version'
`:prefix'
`:set-after'
`:set'
`:type'.
magit-{log-reflog-re,refresh-reflog-buffer}: better format

Drop the unnecessary "*" prefix.  Do so not only in the format and
regexp, but also in the display.  And replace the unnecessarily ugly
separators in the format and regexp.
magit-log-reflog-re: deal with git-merge inconsistency

Other commands put the revs and refs they deal with after the colon.
Before the colon goes the command and in some cases details about the
command, i.e. what variant of the command is used or in what mode
command was performed.

  rebase -i (finish): commit message

`git-merge' confuses the order and the position of the colon.

  merge branch-name: Fast-forward

Adjust the regexp to pretend the colon comes before the branch-name.
Ignore the detail part for now.
magit-reflog-subject-re: remove unnecessary complication

"-" doesn't have a special meaning at the beginning of '[...]'.
And right after '^' is still "at the beginning".
magit-reflog-subject-re: remove strange submatch

I am not aware of any git command that would produce this "status" part
and this might actually match to much when `update-rev' is used directly.
Use `user-error' instead of `error'.

Function `user-error' is new in GNU Emacs 24.3.  A fallback to `error'
is provided for older version.  It is supposed to be used in case of an
incorrect manipulation instead of a real error.  GNU Emacs will not
enter the debugger for a `user-error' even if `debug-on-error' in
enabled.  Which makes life a lot easier for us elisp developers.

Signed-off-by: Rüdiger Sonderfeld <ruediger@c-plusplus.de>
Adapted-by: Jonas Bernoulli <jonas@bernoul.li>

(Don't change `magit-key-mode.el' to avoid merge conflics, fix
a whitespace error, fix typo in commit summary, and keep using
`concat' to build long messages.)
Merge branch 'pr/user-error'
magit-refresh-reflog-buffer: use git-reflog

Use the git command `reflog' to display the reflog,
not `log --walk-reflogs'.  That's ... simpler.
reflog: also insert reflog identifier

but abbreviate it to just a number.
magit-log-margin-set-timeunit-width: new function

Extract `magit-log-margin-set-timeunit-width' from
`magit-refresh-log-buffer' so that it can be used elsewhere to.

Actually we should refactor the involved variables so that this only
has to be done when setting the "main" variable.  But there are other
things that should be improved here.  For users sake delay addressing
this particular point to avoid changing the options several times.
reflog: support displaying the log margin
Merge branch 'pr/reflog'

Conflicts:
	magit.el
magit-stgit-show-patch-name: new option