[Scummvm-devel] Samsung Wave/BADA port

[Tarek Soliman]

On Mon, Jun 20, 2011 at 08:28:23PM +0200, Max Horn wrote:
> Maybe you never completed your rebase attempts. Maybe the rebase you did failed, or had a conflict and you finished it. You can use "git rebase --abort" to abort any in-progress rebase. 

FWIW, those of you who are on a unix-like environment can change the shell prompt to display git-related stuff.

It would display the current branch name by default like : (master)
If you were in the middle of a rebase it would display (master|REBASE)

It convenient for these sorts of situations where you don't realize you're still in the middle of a rebase or a merge or what branch you are on.

__git_ps1() is the shell function included with git-completion. You can put \$(__git_ps1) somewhere on your PS1 and it will show it there.

This may also work in windows if you use the bash prompt that comes with msysgit.
-- 
Tarek