On Tuesday, March 6, 2007 at 00:32:28 (+0100) Johannes Schindelin writes:An actual demonstration of my stupidity is much, much preferable to a mere assertion of it, so I read the following with relish. No, I think you missed my point. There are two xyz.o's: One in .master/xyz.o, and one in .branchX/xyz.o. So, you're example becomes: 00:05 you pull upstream into your master branch, which has a newer xzy.c 00:07 you type make. .master/xyz.o is built, because make sees that xyz.c is newer than .master/xyz.o 00:12 you checkout your side branch, xyz.c is updated. 00:13 you type make, and .branchX/xzy.o is built, because xyz.c is newer than .branchX/xyz.o 00:25 you switch back to your master branch. 00:26 you type make, and nothing happens, as it should not. You are happy, and thank the git community for all of their heroic efforts. Now, I'm really going to go: the family is hungry and I've got dinner to prepare, so if you want to flame me for opening my mouth further, feel free. Bill - 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 Woodhouse | Re: [GIT *] Allow request_firmware() to be satisfied from in-kernel, use it in mor... |
| Stefan Richter | Re: 2.6.22 -mm merge plans |
| david | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| Dave Hansen | Re: [RFC/PATCH] Documentation of kernel messages |
git: | |
| Johannes Schindelin | Re: git on MacOSX and files with decomposed utf-8 file names |
| Martin Waitz | comparing file contents in is_exact_match? |
| Jon Smirl | Change set based shallow clone |
| Andreas Hildebrandt | CVS-$Id:$ replacement in git? |
| Jon Morby | IPv6 and OpenBGPD - Protocol not available |
| Alex Thurlow | Router performance on OpenBSD and OpenBGPD |
| Denis Doroshenko | Re: This is what Linus Torvalds calls openBSD crowd |
| Edd Barrett | Re: OpenBSD in the webcomic XKCD |
| Linux Kernel Mailing List | ssb: Fix watchdog access for devices without a chipcommon |
| Linux Kernel Mailing List | USB Serial Sierra: clean-up |
| Linux Kernel Mailing List | [ALSA] hda - Fix ALC262 fujitsu model |
| Linux Kernel Mailing List | USB Serial Sierra: Dynamic interface detection |
