On 1/9/06, Junio C Hamano <[EMAIL PROTECTED]> wrote: > 2. Fix "git checkout <branch>" so that it does a reasonable thing > even when a dirty path is different in current HEAD and > destination branch. Then I could: > > $ git checkout symref ;# this would not work in the current git > # it would die like this: > # $ git checkout symref > # fatal: Entry 'gitweb.cgi' not uptodate. Cannot merge.
That is actually very interesting. I already wished sometimes to be able to switch branches with a dirty working directory (and usually ended up with git diff+checkout+apply). Even if it results in a merge and conflict markers in files it looks like a very practical idea! > $ git diff ;# just to make sure inevitable automated merge > # did the right thing > $ git commit -a -m "Fix symref fix" > # I could collapse them into one instead, like this: > # $ git reset --soft HEAD^ > # $ git commit -a -C ORIG_HEAD - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
