Re: git fetch+rebase on a local tracking branch
- From
Kevin Ballard <kevin@sb.org>
- Date
- Jan 17, 2008, 17:44 UTC
- Message-ID
- <E9B7A445-89FE-49F6-9314-78E5D0095369@sb.org>
- In-Reply-To
- <Pine.LNX.4.64.0801171129430.31161@torch.nrlssc.navy.mil>
On Jan 17, 2008, at 12:33 PM, Brandon Casey wrote:
Show 20 quoted lines
> On Thu, 17 Jan 2008, Kevin Ballard wrote: > >> When I'm working on a local tracking branch, is there an easier way >> to do `git fetch && git rebase origin/branch`? I could imagine >> either a config value like branch.master.rebase = remotes/origin/ >> master (although it would be nice to avoid duplicating the remote >> name, since we already have branch.master.remote), or perhaps a -- >> rebase command to git pull such that it simply performs a rebase >> instead of a merge. >> >> Is there some reason there isn't already a solution like this, or >> am I simply missing something? > > It exists in master. > > commit cd67e4d46b122b161f2ad7d943e4ae7aa8df6cf5 > Author: Johannes Schindelin <Johannes.Schindelin@gmx.de> > Date: Wed Nov 28 13:11:07 2007 +0000 > > Teach 'git pull' about --rebase
Excellent. I've been using master, but apparently I forgot to update my manpages. Glad to see this problem's been solved.
Thanks, Kevin Ballard
-- Kevin Ballard http://kevin.sb.org kevin@sb.org http://www.tildesoft.com