On 2/7/25 10:23, ron minnich wrote:
> what I'm used to
> I'm on branch x
> git pull --rebase origin main
> 
> with 9front git
> I'm on branch x
> git/pull -f origin
> git/rebase origin/heads/front
> 
> That does not look right. Reading /bin/git/rebase, I almost think I want to do
> git/branch heads/front
> git/rebase heads/x
> 
> but I'm a bit uncertain. I'm not good with branchesĀ at the best of times.


I think what you're looking for is:
git/pull -f origin
git/rebase remotes/origin/$upstreambranch

git/branch -a will give you all the details about what remote branches we're 
tracking.

I don't tend to use our git/rebase much, I tend to just use git/log -se 
branchA..branchB or the inverse to
get the commit list and git/export and git/import by hand. Or stash my current 
branch, reset the one tracking
upstream and then go from there.


Thanks,
moody



------------------------------------------
9fans: 9fans
Permalink: 
https://9fans.topicbox.com/groups/9fans/T9075ee3b04492dd0-Mf370c4581ed85ad438775722
Delivery options: https://9fans.topicbox.com/groups/9fans/subscription

Reply via email to