On Mon, Mar 8, 2010 at 9:31 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Peter Baumann <waste.manager@xxxxxx> writes: > >> Huh? Keep changes (by not touching the worktree) and then aborting if we >> touch the worktree. Seems like a contradiction to me. > > Here is my try... > > Reset the index to the given commit, keeping local changes in the working > tree since the current commit, while updating working tree files without > local changes to what appears in the given commit. If a file that is > different between the current commit and the given commit has local > changes, reset is aborted. I agree that it is better. I will post a patch with this change this evening if you don't do it before. Thanks, Christian. -- 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