Junio C Hamano <gitster@pobox.com> writes:As Pierre said earlier, a partial revert via "revert <commit> -- <paths>" and a partial cherry-pick would make quite a lot of sense, and in addition, it should not be too hard to add. Reusing the 'merge-recursive' part should be almost trivial. The only tricky part is coming up with a fake tree using base and next commit in revert_or_cherry_pick() for this purpose. When replaying the change from A->B (when cherry-picking, A is the parent and B is what was named from the command line; when reverting, they are the other way around), instead of doing the three-way merge using: merge-recursive A HEAD B you would first come up with a modified tree B' that has the identical contents to A _except_ the parts the path limiters specify which are taken from B. Then running merge-recursive A HEAD B' would replay the revert or cherry-pick of change from A->B, limited by the path, on top of the current HEAD. As to "reverting to the index" case, if somebody is interested in doing a builtin-checkout.c, please keep in mind that major parts of that work should be made available to the implementation of "git revert [--] <paths>", as it appears that it will be exactly the same as "git checkout" with the same set of options. I am wondering what "git cherry-pick -- <paths>" should do. My current thinking is that it would not make any sense at all. - 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
| Rafael J. Wysocki | [Bug #11207] VolanoMark regression with 2.6.27-rc1 |
| David Miller | [GIT]: Networking |
| Larry Finger | Regression in 2.6.27 caused by commit bfc0f59 |
| Chuck Ebbert | Why do so many machines need "noapic"? |
git: | |
| Alex Riesen | Re: Git Cygwin - unable to create any repository - help! |
| Johan Herland | [PATCH 0/5] Fix 'url.*.insteadOf' for submodule URLs |
| Mike | I don't want the .git directory next to my code. |
| Josh England | cloning/pulling hooks |
| Linux Kernel Mailing List | powerpc/mpc5121: Update device tree for MPC5121ADS evaluation board |
| Linux Kernel Mailing List | powerpc/virtex: Fix booting of Xilinx FPGAs with 16550 for 405 and 440 |
| Linux Kernel Mailing List | x86: add MAP_STACK mmap flag |
| Linux Kernel Mailing List | atmel_lcdfb: don't initialize a pre-allocated framebuffer |
| Alexey Suslikov | OpenBSD 4.2 on Intel Board S3000AHLX + QuadNic EXPI9404PT => couldn't map interrupt |
| Nick Guenther | Re: Real men don't attack straw men |
| Richard Daemon | Nfsen and php problems...? |
| David B. | find -exec {} help |
