Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next
Merge branch 'master' into next
Add switches for including untracked or all files in stashes that git lerned in v1.7.8.
Adds magit-filelog to display the log of a particular file

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Renames `filelog' to `file-log' following a comment of @snogglethorpe

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Adds magit-show-file-revision which presents a file at a particular revision

Signed-off-by: Damien Cassou <damien.cassou@gmail.com>
Merge branch 'master' into next

Conflicts:
	Makefile
Merge commit 'f48a6a9' into next
Merge commit '7c2d4cf' into next
Merge branch 'master' into next
Merge branch 'master' into next
Teach reset-working-tree to delete ignored files

Add the (relatively) new "-x" option to git-clean if two prefix args
are specified.
Merge branch 'clean-include-ignored' into next
Merge branch 'master' into next
Use magit--branch-name-at-point where appropriate

This commit is unrelated to the others in the "remote-branch-fix"
branch.
Add optional arg "no-trim" to "magit-name-rev" and "magit-default-rev"
Fix magit-remote-part-of-branch and magit-branch-no-remote

Now they handle refs starting with "refs/remotes/" instead of just
"remotes/".
Use the no-trim argument in the default for "magit-delete-branch".

This ensures that when point is on a remote branch, the default starts
with "remotes/".