git-for-steve tweaks.

git-for-steve tweaks.

	* contrib/git-for-steve.sh: Take more of a "git approach" to
	testing if we're in a SXEmacs repo.

	Save the current branch name in case we move from it and want to
	return.

	popd _before_ popping the stash.

	Give the user a way to bypass the origin check.

	(set_branch): Only switch to master if it's not the current
	branch.
	Ask if the user wants to switch to for-steve, instead of forcing
	it.

	(set_aliases): Make alias.alias only show aliases, and not every
	config containing "alias".
	Add a couple of new aliases:
	  "cob" -> "checkout -b"
	  "prb" -> "pull --rebase"
	  "wb" -> "rev-parse --abbrev-ref HEAD".

	* contrib/git-for-steve.sh (LETSPOP):

Signed-off-by: Steve Youngs <steve@sxemacs.org>