Thread (8 messages) flat view 8 messages, 3 authors, 2016-06-15

Re: [PATCHv2 2/2] pull: support rebased upstream + fetch + pull --rebase

From: Santi Béjar <hidden>
Date: 2016-06-15 22:47:03

Possibly related (same subject, not in this thread)

2009/7/16 Santi Béjar [off-list ref]:
Use the fork commit of the current branch (where
the tip of upstream branch used to be) as the upstream parameter of
"git rebase". Compute it walking the reflog to find the first commit
which is an ancestor of the current branch.

Signed-off-by: Santi Béjar <redacted>

Changed since v1:
 - rename reflist to remoteref to better reflect its use
 - (( $num + 1 ))
Arg! It should not be in the commit message! Sorry. Junio, can you
amend it if applied? Thanks

Santi
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help