git/read-tree.c, branch v1.2.2

read-tree --aggressive

2006-02-07T05:43:27Z

A new flag --aggressive resolves what we traditionally resolved with external git-merge-one-file inside index while read-tree 3-way merge works. git-merge-octopus and git-merge-resolve use this flag before running git-merge-index with git-merge-one-file. Signed-off-by: Junio C Hamano

avoid asking ?alloc() for zero bytes.

2005-12-27T01:23:59Z

Avoid asking for zero bytes when that change simplifies overall logic. Later we would change the wrapper to ask for 1 byte on platforms that return NULL for zero byte request. Signed-off-by: Junio C Hamano

Make the rest of commands work from a subdirectory.

2005-11-29T07:13:02Z

These commands are converted to run from a subdirectory. commit-tree convert-objects merge-base merge-index mktag pack-objects pack-redundant prune-packed read-tree tar-tree unpack-file unpack-objects update-server-info write-tree Signed-off-by: Junio C Hamano

ls-files and read-tree need core.filemode

2005-11-08T09:23:52Z

ls-files.c and read-tree.c miss the default configuration, in particular the filemode=false part. The recent +x bit flip made me notice that, because git-merge refused to merge anything saying that git-pull.sh is not up to date. Signed-off-by: Junio C Hamano

Remove empty directories after read-tree -u.

2005-10-11T00:34:08Z

This fixes everybody's favorite gripe that switching branche with 'git checkout' leaves empty directories. Signed-off-by: Junio C Hamano

read-tree: --trivial

2005-10-02T17:42:46Z

This adds an option --trivial to restrict 3-way 'read-tree -m -u' to happen only if there is no file-level merging required. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

read-tree: remove --head option.

2005-10-02T07:50:16Z

Initially it was to allow specifying more than one remote to allow creation of an Octopus, but it is not being used. Signed-off-by: Junio C Hamano

Document -i flag to git-read-tree

2005-09-20T22:07:52Z

Somehow I missed it when we updated read-tree to support the recursive merge strategy. Also -i should require -m as well, which the command did not check. Signed-off-by: Junio C Hamano

read-tree: fix bogus debugging statement.

2005-09-14T05:27:42Z

We wanted to detect case #16 which should be rare, but botched the case when some paths are missing, causing a segfault. My fault. Signed-off-by: Junio C Hamano

Add a new merge strategy by Fredrik Kuivinen.

2005-09-11T02:46:53Z

I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano