cache status after git pull

2005-08-25 Thread tony . luck
* When the branch head pointed by $GIT_DIR/HEAD changes while the index file and working tree are looking the other way (e.g. somebody pushed into your repository, or you ran git fetch to update the ref your working tree is on), git checkout without -f gets confused. Figure out a good way to

Re: cache status after git pull

2005-08-25 Thread Junio C Hamano
[EMAIL PROTECTED] writes: Aha ... is this the problem that caught me out last week (when I ended up with 10 extra files attached to one of my commits)? Plausible. 1) Updated my linus branch: $ git checkout linus git pull linus I would assume that just after git checkout linus before

Re: cache status after git pull

2005-08-25 Thread Junio C Hamano
Luck, Tony [EMAIL PROTECTED] writes: What I want is to get the latest from kernel.org...linus...master and update my .refs/heads/linus with the new SHA1. I'd like to be able to do that without touching what is in my index, and without changing the state of any checked out files. If that is