{"thread":{"id":"11657","subject":"git fetch+rebase on a local tracking branch","startedAt":"2008-01-17T17:24:58Z","lastAt":"2008-01-17T17:44:56Z","messageCount":3,"participants":["Kevin Ballard","Brandon Casey"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"65735","messageId":"6C0A045B-658F-4ECE-93DB-A61F77AAA1F8@sb.org","threadId":"11657","inReplyTo":null,"subject":"git fetch+rebase on a local tracking branch","fromName":"Kevin Ballard","fromEmail":"kevin@sb.org","sentAt":"2008-01-17T17:24:58Z","receivedAt":"2008-01-17T17:24:58Z","isPatch":false,"sender":{"key":"kevin@sb.org","avatar":"https://avatars.githubusercontent.com/u/714?v=4"},"body":"When I'm working on a local tracking branch, is there an easier way to  \ndo `git fetch && git rebase origin/branch`? I could imagine either a  \nconfig value like branch.master.rebase = remotes/origin/master  \n(although it would be nice to avoid duplicating the remote name, since  \nwe already have branch.master.remote), or perhaps a --rebase command  \nto git pull such that it simply performs a rebase instead of a merge.\n\nIs there some reason there isn't already a solution like this, or am I  \nsimply missing something?\n\nOne of the reasons I really want a hands-off solution to rebasing is  \nI'm somewhat paranoid of accidentally rebasing from origin/master when  \nI'm sitting on another branch. If my branch knows where it's supposed  \nto rebase from in normal usage, that solves the problem.\n\nI'd like to mention that the largest conceptual hurdle in migrating  \nfrom another VCS is that pull and push are not opposite commands, and  \nthat when I'm, say, using a clone of the git repository, unless I'm an  \nintegrator I should always rebase instead of merge. Also, fetch+rebase  \nis so common I'm surprised it doesn't already have a single command  \nshortcut.\n\nPlease note that I'm not asking for someone else to implement this,  \nI'm simply asking for feedback so, if I choose to go forward on this  \nmyself, I don't end up implementing the wrong solution.\n\n-Kevin Ballard\n\n-- \nKevin Ballard\nhttp://kevin.sb.org\nkevin@sb.org\nhttp://www.tildesoft.com\n\n\n"},{"id":"65736","messageId":"Pine.LNX.4.64.0801171129430.31161@torch.nrlssc.navy.mil","threadId":"11657","inReplyTo":"6C0A045B-658F-4ECE-93DB-A61F77AAA1F8@sb.org","subject":"Re: git fetch+rebase on a local tracking branch","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2008-01-17T17:33:06Z","receivedAt":"2008-01-17T17:33:06Z","isPatch":false,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"On Thu, 17 Jan 2008, Kevin Ballard wrote:\n\n> When I'm working on a local tracking branch, is there an easier way to do \n> `git fetch && git rebase origin/branch`? I could imagine either a config \n> value like branch.master.rebase = remotes/origin/master (although it would be \n> nice to avoid duplicating the remote name, since we already have \n> branch.master.remote), or perhaps a --rebase command to git pull such that it \n> simply performs a rebase instead of a merge.\n>\n> Is there some reason there isn't already a solution like this, or am I simply \n> missing something?\n\nIt exists in master.\n\ncommit cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5\nAuthor: Johannes Schindelin <Johannes.Schindelin@gmx.de>\nDate:   Wed Nov 28 13:11:07 2007 +0000\n\n     Teach 'git pull' about --rebase\n\n...\n\n-brandon\n"},{"id":"65738","messageId":"E9B7A445-89FE-49F6-9314-78E5D0095369@sb.org","threadId":"11657","inReplyTo":"Pine.LNX.4.64.0801171129430.31161@torch.nrlssc.navy.mil","subject":"Re: git fetch+rebase on a local tracking branch","fromName":"Kevin Ballard","fromEmail":"kevin@sb.org","sentAt":"2008-01-17T17:44:56Z","receivedAt":"2008-01-17T17:44:56Z","isPatch":false,"sender":{"key":"kevin@sb.org","avatar":"https://avatars.githubusercontent.com/u/714?v=4"},"body":"On Jan 17, 2008, at 12:33 PM, Brandon Casey wrote:\n\n> On Thu, 17 Jan 2008, Kevin Ballard wrote:\n>\n>> When I'm working on a local tracking branch, is there an easier way  \n>> to do `git fetch && git rebase origin/branch`? I could imagine  \n>> either a config value like branch.master.rebase = remotes/origin/ \n>> master (although it would be nice to avoid duplicating the remote  \n>> name, since we already have branch.master.remote), or perhaps a -- \n>> rebase command to git pull such that it simply performs a rebase  \n>> instead of a merge.\n>>\n>> Is there some reason there isn't already a solution like this, or  \n>> am I simply missing something?\n>\n> It exists in master.\n>\n> commit cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5\n> Author: Johannes Schindelin <Johannes.Schindelin@gmx.de>\n> Date:   Wed Nov 28 13:11:07 2007 +0000\n>\n>    Teach 'git pull' about --rebase\n\nExcellent. I've been using master, but apparently I forgot to update  \nmy manpages. Glad to see this problem's been solved.\n\nThanks,\nKevin Ballard\n\n-- \nKevin Ballard\nhttp://kevin.sb.org\nkevin@sb.org\nhttp://www.tildesoft.com\n\n\n"}]}