On 2008-01-24 15:31:40 +0000, Catalin Marinas wrote: > Another thing, can the '--keep' option be added? Can it work with > the new structure? I use it quite often as I make some minor > modification and I'd like to pop patches without affecting the local > changes. As is, it works out of the box as long as your local changes are in files not touched by the command. Making it work in other cases as well should be doable -- behind the scenes, we'd save the local changes much like a patch, and try to apply it at the end. (In fact, we should probably not create this "patch" until git-read-tree tells us it can't do its job due to local changes.) Adding the --keep flag once would make it available for all commands using the new infrastructure. -- Karl Hasselström, kha@xxxxxxxxxxx www.treskal.com/kalle - 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