Hi,
On Sun, 9 Jul 2006, Alex Riesen wrote:
Linus Torvalds, Sun, Jul 09, 2006 05:15:41 +0200:
quoted
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