> Could you point me to that 'git-bash thing'? -- Looks very useful >
Note that it only works for zsh (z-shell) and bash, so you'll need to run either Linux, Mac, or Windows with Cygwin (or Git Bash). In the above shells, you have a variable called the PS1 which value appears in front of your command line prompt (typically username@machine, timestamp and stuff like that). There's a very popular script called git-prompt.sh that adds useful Git context to the PS1. It's available here: https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh How to setup is described in the comments of that file. You can find my whole personal setup here: http://blog.tfnico.com/2012/03/my-terminalshell.html (although I use an older copy of git-prompt.sh<https://github.com/tfnico/prefs/blob/master/git-completion.bash> ). > Yes this is the kind of thing I was asking about -- Say I do a pull and > get stuck on a conflict. Is there some easy way to find out what state (or > as you called it 'mode') git is in? Note that I may want to know this at a > different point of time from when the pull message is still in front of me > in the terminal. Git keeps this state inside the .git folder somehow. I don't know them all, but I just tested with a merge conflict, and saw these files appeared inside the .git repo: - MERGE_HEAD - MERGE_MODE - MERGE_MSG There probably are corresponding files for the other modes. Oh, and for Windows/Powershell there's an alternative git-prompt thing: posh-git <https://github.com/dahlbyk/posh-git>, which I touch on in this post: http://blog.tfnico.com/2012/04/my-git-setup-on-windows.html -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/-EAER4YId7sJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
