From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 09 Jul 2006 14:30:44 GMT
Subject: Re: RFH: refactor read-tree
Message-ID: <Pine.LNX.4.63.0607091630110.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <20060709124324.GE5919@steel.home>

Hi,

On Sun, 9 Jul 2006, Alex Riesen wrote:

> Linus Torvalds, Sun, Jul 09, 2006 05:15:41 +0200:
> > The basic idea is that "branch1" should be your current branch, and it 
> > obviously is also expected to match (more or less) the current index. So 
> > you can do a merge by
> > 
> >  - reading in "branch1" into the index:
> > 
> > 	GIT_INDEX_FILE=.git/tmp-index git-read-tree -m branch1
> 
> what is "-m" here for?

It means that git-read-tree tries to merge the current index with branch1.

Ciao,
Dscho