Re: git annoyances: how to force git to fetch a particular file

2006-07-19 Thread Francois Gouget
On Wed, 12 Jul 2006, Mike McCormack wrote: [...] You can compare the index to HEAD with the following command, as I mentioned: git diff-index -p HEAD Actually this command will show a diff of both files that are in the index and files that are NOT in the index. If all you are interested in i

Re: git annoyances: how to force git to fetch a particular file

2006-07-11 Thread Troy Rollo
On Wednesday 12 July 2006 14:47, Dan Kegel wrote: > Sigh, I guess I'll just have to keep blowing away my git tree every > few days... shame I'm not smart enough to use 'git fetch' properly. > - Dan From the bottom of : If you have made changes in the working copy b

Re: git annoyances: how to force git to fetch a particular file

2006-07-11 Thread Mike McCormack
Dan Kegel wrote: git diff-index -p HEAD > foo.diff /me goes off to read up on the -index commands, which are news to me. You've probably figured it out already, but for anybody else... The git "index" can be thought of as a record of what's checked out, or the thing you're about to commit

Re: git annoyances: how to force git to fetch a particular file

2006-07-11 Thread Dan Kegel
On 7/11/06, Mike McCormack <[EMAIL PROTECTED]> wrote: > Sigh, I guess I'll just have to keep blowing away my git tree every > few days... shame I'm not smart enough to use 'git fetch' properly. Well, if you want to do it in a bit of a round about way: git diff-index -p HEAD > foo.diff /me goe

Re: git annoyances: how to force git to fetch a particular file

2006-07-11 Thread Mike McCormack
Dan Kegel wrote: Sigh, I guess I'll just have to keep blowing away my git tree every few days... shame I'm not smart enough to use 'git fetch' properly. Well, if you want to do it in a bit of a round about way: git diff-index -p HEAD > foo.diff patch -p1 -R < foo.diff vi foo.diff #remove b

Re: git annoyances: how to force git to fetch a particular file

2006-07-11 Thread Dan Kegel
On 7/10/06, Alexandre Julliard <[EMAIL PROTECTED]> wrote: "Dan Kegel" <[EMAIL PROTECTED]> writes: > What's the right way to force a get of a particular file? > With cvs, you can just remove the file and do 'cvs update foo.c', > but I'm having trouble RTF git M, and the otherwise helpful > http:/

Re: git annoyances: how to force git to fetch a particular file

2006-07-10 Thread Alexandre Julliard
"Dan Kegel" <[EMAIL PROTECTED]> writes: > What's the right way to force a get of a particular file? > With cvs, you can just remove the file and do 'cvs update foo.c', > but I'm having trouble RTF git M, and the otherwise helpful > http://wiki.winehq.org/GitWine doesn't seem to mention this case.

Re: git annoyances: how to force git to fetch a particular file

2006-07-10 Thread Paweł Różański
Actually i use cg-restore from the cogito suite (can be mostly used parallel with git). It's a quite big shell script which call more than one git function) cg-diff with colors is nice too... or cg-log -s (shows log similar to web based shortlog git viewer) I hope this helps.. -- Paweł Różański

git annoyances: how to force git to fetch a particular file

2006-07-10 Thread Dan Kegel
What's the right way to force a get of a particular file? With cvs, you can just remove the file and do 'cvs update foo.c', but I'm having trouble RTF git M, and the otherwise helpful http://wiki.winehq.org/GitWine doesn't seem to mention this case. (Every so often, it seems like git fetch doesn'