Johannes Schindelin wrote:It's already blurred, since we have git-pull instead of just git-fetch. pull is the dwim version of fetch for anyone who isn't frequently pulling from multiple repos that aren't configured as remotes (99% of git's users). It really is. You configure it to merge this and that branch to those and these branches. Sometimes it does and sometimes it doesn't, and the decision is based on what branch you're currently on. Only git-fetch has the clear local vs remote distinction, because it *never* merges anything. On a side-note, I'm starting to see why hg has gotten such a user-base. Their docs focus on one repo per branch, which doesn't have this problem at all. So in short, letting "git-pull" fast-forward (or rebase; I like that idea) the local copies of the remote tracking branches onto those remote tracking branches will make life easier for: * People who collaborate with others in a shared environment, where branch heads frequently change in the mothership repo but all development is supposed to be done at the tip of those mothership branches anyway. Nearly all corporate users fall into this category. * People who just want to track and test the latest and greatest version of software X. Sometimes trying latest stable, and sometimes going with the freshest beta. They won't want to do "git merge beta origin/beta" after having done "git checkout beta", but they sure as hell don't want to run anything but the latest either. They may contribute once in a while, but generally just want to make sure they've got the bleeding edge. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 - 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
| Avi Kivity | [PATCH 09/58] KVM: MMU: Respect nonpae pagetable quadrant when zapping ptes |
| Andrew Morton | 2.6.25-rc2-mm1 |
| James Morris | Re: LSM conversion to static interface |
| Eric W. Biederman | Re: [PATCH] kexec: force x86_64 arches to boot kdump kernels on boot cpu |
git: | |
| David Miller | Re: 2.6.25-rc8: FTP transfer errors |
| Gerrit Renker | [PATCH 27/37] dccp: Integration of dynamic feature activation - part 2 (server side) |
| David Miller | Re: [GIT *] Solos PCI ADSL card update |
| David Miller | Re: [PATCH] pkt_sched: Destroy gen estimators under rtnl_lock(). |
