Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] Make rebase smarter

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:44

Johannes Schindelin [off-list ref] writes:
On Fri, 26 Oct 2007, Junio C Hamano wrote:
quoted
Steven Walter [off-list ref] writes:
quoted
It is a common workflow to run "git fetch; git rebase origin/<foo>" 
Where foo is the remote tracking branch.  git-rebase should default to 
using the remote tracking branch if no other ref is given.
This would be a reasonable choice between refusing outright and
picking one possible action.
Another sensible choice would be "git rebase FETCH_HEAD", at least just 
after a "git fetch <nick> <branch>"...
We can get the best of both worlds by noticing a line in
FETCH_HEAD without not-for-merge marker and use that as the
'onto' commit for the rebase.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help