[git-users] Git pull shows merge conflicts, git mergetool shows none

2010-08-16 Thread jog
Hi Can someone explain how a 'git pull' can result in an auto-merge conflict, thus be left with a manual merge to be done, 'git status' showing 'unmerged' files as a result and still have 'git mergetool' show 'No files to be merged' ? That's the second time I encounter this - sometimes

[git-users] Checking out a branch

2010-08-16 Thread David Doria
First, I clone my github repo: git clone g...@github.com:daviddoria/daviddoria-vtk.git Then I want to work on a particular branch (there are several - you can see them here: http://github.com/daviddoria/daviddoria-vtk) If I 'git branch -a' I see: [dor...@doriadjec VTK-GraphIterators]$ git

Re: [git-users] Checking out a branch

2010-08-16 Thread Michael P. Soulier
David Doria wrote: git checkout remotes/origin/VTK-GraphConversions Don't check out remote branches, create your own based on them. git checkout -b VTK-GraphConversions origin/VTK-GraphConversions Mike signature.asc Description: OpenPGP digital signature

Re: [git-users] Checking out a branch

2010-08-16 Thread danpreston
git checkout -b VTK-GraphConversions origin/VTK-GraphConversions I don't believe that will setup the upstream configuration. If you will usually be pushing and pulling from this remote branch, you may want to use the --track option. If you use the --track option, you can also omit the -b

Re: [git-users] Checking out a branch

2010-08-16 Thread danpreston
On Aug 16, 2010, at 10:16 AM, David Doria wrote: It seems like it creates a NEW branch because I get That's really what you want though. You can think of the remotes/origin/VTK-GraphConversions branch, as your local mirror of the remote branch. You will never commit to it directly because

[git-users] Re: Word wrap in Terminal

2010-08-16 Thread Konstantin Khomoutov
On Aug 17, 12:13 am, Roddie Grant gitl...@myword.co.uk wrote: This is one of those things that should be obvious, but I'm blowed if I can find it. When I use git log in Terminal on my Mac there is no word wrap, so I only get partial commit messages thus (deliberately exaggerated because of