{"thread":{"id":"9164","subject":"RFC: git pull or git rebase?","startedAt":"2007-07-23T05:22:23Z","lastAt":"2007-07-23T09:31:42Z","messageCount":3,"participants":["Michael S. Tsirkin","Alex Riesen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"48264","messageId":"20070723052223.GA20614@mellanox.co.il","threadId":"9164","inReplyTo":null,"subject":"RFC: git pull or git rebase?","fromName":"Michael S. Tsirkin","fromEmail":"mst@dev.mellanox.co.il","sentAt":"2007-07-23T05:22:23Z","receivedAt":"2007-07-23T05:22:23Z","isPatch":false,"sender":{"key":"mst@kernel.org","avatar":null},"body":"Hi!\nI'm working on several kernel-related projects at the same time:\n- some of them are small, and private, so I do a fetch\n  and rebase to update to Linus' code, to keep history clean\n- some of them are larger, and involve several other people,\n  so I do git pull (the history is messy anyway)\n\nProblem is, I get confused sometimes and do a git pull\ninstead of git rebase, or vice versa. Of course I can just\nreset to ORIG_HEAD when I realise my mistake.\n\nHowever, I wonder whether this happens to others, too.\nWould it make sense to add a branch attribute that says\n\"do not pull this branch\" or \"do not rebase this branch\"?\nMaybe even make git do the right thing automatically,\nso that git would look at this attribute and perform\npull or rebase as appropriate?\n\nThanks,\n\n-- \nMST\n"},{"id":"48288","messageId":"81b0412b0707230207k2fa33eb3hdc23319d1f8dbd80@mail.gmail.com","threadId":"9164","inReplyTo":"20070723052223.GA20614@mellanox.co.il","subject":"Re: RFC: git pull or git rebase?","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-07-23T09:07:44Z","receivedAt":"2007-07-23T09:07:44Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:\n> However, I wonder whether this happens to others, too.\n> Would it make sense to add a branch attribute that says\n> \"do not pull this branch\" or \"do not rebase this branch\"?\n> Maybe even make git do the right thing automatically,\n> so that git would look at this attribute and perform\n> pull or rebase as appropriate?\n\nIf you have a recent enough git, it will refuse to pull into\na branch for which there is no configured remote branch.\nExactly for a reason like yours.\n"},{"id":"48290","messageId":"20070723093142.GE20614@mellanox.co.il","threadId":"9164","inReplyTo":"81b0412b0707230207k2fa33eb3hdc23319d1f8dbd80@mail.gmail.com","subject":"Re: RFC: git pull or git rebase?","fromName":"Michael S. Tsirkin","fromEmail":"mst@dev.mellanox.co.il","sentAt":"2007-07-23T09:31:42Z","receivedAt":"2007-07-23T09:31:42Z","isPatch":false,"sender":{"key":"mst@kernel.org","avatar":null},"body":"> Quoting Alex Riesen <raa.lkml@gmail.com>:\n> Subject: Re: RFC: git pull or git rebase?\n> \n> On 7/23/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:\n> >However, I wonder whether this happens to others, too.\n> >Would it make sense to add a branch attribute that says\n> >\"do not pull this branch\" or \"do not rebase this branch\"?\n> >Maybe even make git do the right thing automatically,\n> >so that git would look at this attribute and perform\n> >pull or rebase as appropriate?\n> \n> If you have a recent enough git, it will refuse to pull into\n> a branch for which there is no configured remote branch.\n> Exactly for a reason like yours.\n\nAha. I created the tree by git clone, so my master\nis configured to merge from origin automatically.\n\n-- \nMST\n"}]}