> Quoting Alex Riesen <raa.lkml@xxxxxxxxx>: > Subject: Re: RFC: git pull or git rebase? > > On 7/23/07, Michael S. Tsirkin <mst@xxxxxxxxxxxxxxxxxx> wrote: > >However, I wonder whether this happens to others, too. > >Would it make sense to add a branch attribute that says > >"do not pull this branch" or "do not rebase this branch"? > >Maybe even make git do the right thing automatically, > >so that git would look at this attribute and perform > >pull or rebase as appropriate? > > If you have a recent enough git, it will refuse to pull into > a branch for which there is no configured remote branch. > Exactly for a reason like yours. Aha. I created the tree by git clone, so my master is configured to merge from origin automatically. -- MST - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html