Re: Change "pull" to _only_ download, and "git update"=pull+merge?

From: Petr Baudis <pasky@ucw.cz>
Date: Apr 20, 2005, 21:15 UTC
Message-ID: <20050420211505.GE19112@pasky.ji.cz>
In-Reply-To: <20050420204551.GA13944@elte.hu>

Dear diary, on Wed, Apr 20, 2005 at 10:32:35PM CEST, I got a letter where Ingo Molnar <mingo@elte.hu> told me that...

Show 19 quoted lines

> 
> * Petr Baudis <pasky@ucw.cz> wrote:
> 
> > > yet another thing: what is the canonical 'pasky way' of simply nuking 
> > > the current files and checking out the latest tree (according to 
> > > .git/HEAD). Right now i'm using a script to:
> > > 
> > >   read-tree $(tree-id $(cat .git/HEAD))
> > >   checkout-cache -a
> > > 
> > > (i first do an 'rm -f *' in the working directory)
> > > 
> > > i guess there's an existing command for this already?
> > 
> > git cancel
> 
> hm, that's a pretty unintuitive name though. How about making it 'git 
> checkout' and providing a 'git checkout -f' option to force the 
> checkout? (or something like this)

Since it does not really checkout. Ok, it does, but that's only small part of it. It just cancels whatever local changes are you doing in the tree and bring it to consistent state. When you have a merge in progress and after you see the sheer number of conflicts you decide to get your hands off, you type just git cancel. Doing basically anything with your tree (not only local changes checkout would fix, but also various git operations, including git add/rm and git seek) can be easily fixed by git cancel.

Dear diary, on Wed, Apr 20, 2005 at 10:45:51PM CEST, I got a letter where Ingo Molnar <mingo@elte.hu> told me that...

Show 23 quoted lines

> 
> * Petr Baudis <pasky@ucw.cz> wrote:
> 
> > Dear diary, on Wed, Apr 20, 2005 at 09:01:57AM CEST, I got a letter
> > where Ingo Molnar <mingo@elte.hu> told me that...
> > >  [...]
> > >  fatal: unable to execute 'gitmerge-file.sh'
> > >  fatal: merge program failed
> > 
> > Pure stupidity of mine, I forgot to add gitmerge-file.sh to the list of
> > scripts which get installed.
> 
> another thing is this annoying message:
> 
>  rsync: link_stat "/linux/kernel/people/torvalds/git.git/tags" (in pub) 
>  failed: No such file or directory (2)
>  rsync error: some files could not be transferred (code 23) at 
>  main.c(812)
>  client: nothing to do: perhaps you need to specify some filenames or 
>  the --recursive option?
> 
> you said before that it's "harmless", but it's annoying nevertheless as 
> one doesnt know for sure whether the pull went fine.

Already fixed. (Well, "fixed"... sent to /dev/null. ;-)

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor