Alex Riesen <raa.lkml@xxxxxxxxx> writes: > Junio C Hamano, Mon, Sep 01, 2008 12:38:25 +0200: >> Alex Riesen <raa.lkml@xxxxxxxxx> writes: >> >> > ... IOW, copy the commit >> > resolution from some other merge commit. Maybe can be a way to use >> > rerere mechanism with that? >> >> If you know which merge I did you want to steal from, you can prime your >> rerere database by pretending to be me, doing the merge. Something like: >> >> $ git checkout $merge^1 ;# detach to the parent of merge >> $ git merge $merge^2 ;# pretend you were me to redo it >> $ git diff -R $merge | git apply --index ;# and get what I did > > I ended up using I think the last step should be "git read-tree --reset -u $merge" if we really want the minimum sequence. -- 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
