git fetch+rebase on a local tracking branch

[Kevin Ballard <kevin@xxxxxx>]

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?

One of the reasons I really want a hands-off solution to rebasing is  
I'm somewhat paranoid of accidentally rebasing from origin/master when  
I'm sitting on another branch. If my branch knows where it's supposed  
to rebase from in normal usage, that solves the problem.

I'd like to mention that the largest conceptual hurdle in migrating  
from another VCS is that pull and push are not opposite commands, and  
that when I'm, say, using a clone of the git repository, unless I'm an  
integrator I should always rebase instead of merge. Also, fetch+rebase  
is so common I'm surprised it doesn't already have a single command  
shortcut.

Please note that I'm not asking for someone else to implement this,  
I'm simply asking for feedback so, if I choose to go forward on this  
myself, I don't end up implementing the wrong solution.

-Kevin Ballard

--
Kevin Ballard
http://kevin.sb.org
kevin@xxxxxx
http://www.tildesoft.com

<<attachment: smime.p7s>>