On 6/19/07, Theodore Tso <tytso@xxxxxxx> wrote:
Actually, the bigger missing gap is merges. Suppose in the development branch, you rename a whole bunch of files. (For example, foo_super.c got moved to foo/super.c, foo_inode.c got moved to foo/inode.c, etc.)
I thought that the "recursive" strategy covered this - though I don't work on a tree that merges across branches with renames, so my experience is _very_ limited.
From Documentation/merge-strategies.txt:
Additionally this can detect and handle merges involving renames. This is the default merge strategy when pulling or merging one branch. cheers m - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
