Hello! The following situation: - The last commit was a merge, mhich broke some files - We want three files from the commit before Now I was told to do the following: 1. get the sha1hash from the commit before (cg-log did that) 2. get the sha1hash from the file in that tree: [9:27] srsyg01:walderlift% git-ls-tree 35ff687efc1b19b4db918e5af859894a9dc916e4 Code/lw1/Client/MainForm.xfm 100644 blob 605958b1435f6bdbd5cc502ae3a4c1a281d01f0a Code/lw1/Client/MainForm.xfm 3. cat the file with git-cat-file [9:36] srsyg01:walderlift% git-cat-file blob 605958b1435f6bdbd5cc502ae3a4c1a281d01f0a | less 4. Now overwrite it [9:38] srsyg01:walderlift% git-cat-file blob 605958b1435f6bdbd5cc502ae3a4c1a281d01f0a > Code/lw1/Client/MainForm.xfm 5. Goto 2 and repeat two times Is this really the standard way to recover a file? As a developer / end user I would expect that: cg-recover <filename> <commit id> and -f for overwriting the file if it exists Did I overlook something or is it currently really this complicated? And it is very error prone, if I have to overwrite the files using '>'-redirection (perhaps I mistype the filename). Nico -- Latest project: cconfig (http://nico.schotteli.us/papers/linux/cconfig/) Open Source nutures open minds and free, creative developers. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This archive was generated by hypermail 2.1.8 : 2005-10-19 18:01:48 EST