On Mon, Jul 21, 2008 at 9:48 PM, Steffen Prohaska <[EMAIL PROTECTED]> wrote:
>
> Are you on branch devel in msysgit (the superproject)?
> On branch devel, /etc/gitconfig sets HTML as the default help format.
>
>        Steffen

Indeed it does - thanks.  My workaround was going to suggest
"git config help.format html", but setting up the superproject
correctly is obviously better.

I haven't done much of anything in the superproject, but for me
switching branches is problematic b.c. msys-1.0.dll is in use
by the currently running bash (I selected "bash prompt only"):

This is probably not a big deal, but I thought that I'd mention it.

- Eric

/usr [master] % git remote show
mob
origin
/usr [master] % git remote show origin
* remote origin
  URL: http://repo.or.cz/r/msysgit.git
  Remote branch merged with 'git pull' while on branch devel
    devel
  Remote branch merged with 'git pull' while on branch master
    master
  Stale tracking branches (use 'git remote prune')
    work/p2w work/putty
  Tracked remote branches
    devel full master mob mso/silence_cmd msys work/cheetah
work/git-svn work/git-svn-preview work/msmtp work/new-ssh
/usr [master] % git remote update origin
/usr [master] % git checkout
M       git
Your branch is behind the tracked remote branch 'origin/master' by 5 commits,
and can be fast-forwarded.
/usr [master] % git merge origin/master
Updating bb0b52e..22ef0a8
error: unable to unlink old 'bin/msys-1.0.dll' (Permission denied)
/usr [master] % git checkout devel
error: You have local changes to 'cmd/git.cmd'; cannot switch branches.
/usr [master] % git checkout -f devel
error: unable to unlink old 'bin/msys-1.0.dll' (Permission denied)
Switched to branch "devel"
/usr [devel] %

Reply via email to