"Denis Bueno" <dbueno@gmail.com> writes:Without checking Git User's Manual, I think the solution could go as the following. Assume that history looks like this ...---.---a---*---b---.---... where by '*' is marked corruped commit (commit shich tree contains corrupted blobs). First, you can check the commit message for '*' using git-cat-file or git-show, you can get the difference between 'a' and 'b' using "git diff a b". When you know how repaired commit 'X' should look like, do something like: $ git checkout -b <temp-branch> 'a' $ <edit edit edit> $ git commit Then history would look like this ...---.---a---*---b---.---... \ \-X Now with grafts make 'b' be a child of 'X', i.e. modify parent of 'b' for history to look like below: ...---.---a---* b---.---... \ / \-X-/ Examine history using git-log, git-show, check tree with git-ls-tree and examining files, use graphical history browser like gitk. Then if possible use git-filter-branch to make history recorded in grafts file permanent... HTH -- Jakub Narebski Poland ShadeHawk on #git -- 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
| Linus Torvalds | Linux 2.6.21 |
| debian developer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Jan Engelhardt | intel iommu (Re: -mm merge plans for 2.6.23) |
| Greg Kroah-Hartman | [PATCH 002/196] Chinese: rephrase English introduction in HOWTO |
git: | |
| Andrew Morton | Re: [Bugme-new] [Bug 12877] New: tg3: eth0 transit timed out, resetting -> dead NIC |
| Krzysztof Oledzki | Error: an inet prefix is expected rather than "0/0". |
| David Miller | Re: iptables very slow after commit784544739a25c30637397ace5489eeb6e15d7d49 |
| Johann Baudy | Packet mmap: TX RING and zero copy |
