Jakub Narebski <jnareb@gmail.com> writes:Yes, depending on where you cut off and how reasonable the project history is. Partial checkouts, perhaps, "theirs", NO. Consider that you are working on the tip with partial checkout. Somebody has a bugfix that is applicable to all of ancient, old, maintenance and current codebase. Naturally you would want the bugfix to be applied to ancient, merge it to old, and then maintenance and then current (the last one is what you are working on). What happens if you actually pull ancient when you are partially checked out and use "theirs"? This is probably the most sane way. - 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
| David Miller | Slow DOWN, please!!! |
| Greg KH | Re: Linux 2.6.21 |
| Andrew Morton | Re: 2.6.23-rc6-mm1 |
| Bryan Woods | Stardom SATA HSM violation |
git: | |
| Kyle Moffett | Using GIT to store /etc (Or: How to make GIT store all file permission bits) |
| Tony Stubbs | git svn rebase - could not detach HEAD |
| Ken Pratt | pack operation is thrashing my server |
| Karl | Re: Git checkout preserve timestamp? |
| Richard Stallman | Real men don't attack straw men |
| GVG GVG | ssh_exchange_identification: Connection closed by remote host |
| new_guy | Longest Uptime? |
| Steve B | Intel Atom and D945GCLF2 |
| Peter Schuller | Re: When will ZFS become stable? |
| Sam Fourman Jr. | amd64 NVIDIA support in FreeBSD 7 |
| Justin Hibbits | Re: [ANNOUNCEMENT] Wiki for discussing P35/IHC9(R)/SATA issues set up |
| Dan Davis | Atheros AR928x |
| VPN's on NetBSD | 2 hours ago | NetBSD |
| Why does uClinux 2.6.18 bootup block SuperIO UART IRQs that BIOS configured | 3 hours ago | Linux kernel |
| USB statistics | 5 hours ago | Linux kernel |
| Block Sub System query | 9 hours ago | Linux kernel |
| kernel module to intercept socket creation | 10 hours ago | Linux kernel |
| Image size changing during each build | 10 hours ago | Linux kernel |
| Soft lock bug | 15 hours ago | Linux kernel |
| sysctl - dynamic registration problem | 21 hours ago | Linux kernel |
| Question on swap as ramdisk partition | 1 day ago | Linux kernel |
| serial driver xmit problem | 1 day ago | Linux kernel |
