Re: [9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread ron minnich
yeah, I finally did get it to work. It works more like a merge than the rebase I'm used to, but it works just fine. On Fri, Feb 7, 2025 at 1:55 PM Jacob Moody wrote: > On 2/7/25 15:11, ron minnich wrote: > > I did try this > > git/branch ron_nix > > git/rebase remotes/front/front > > > > it ende

Re: [9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread Jacob Moody
On 2/7/25 15:11, ron minnich wrote: > I did try this > git/branch ron_nix > git/rebase remotes/front/front > > it ended very badly. Your understanding of remote/* is incorrect, run git/branch -a which will give you all of the remote/* branches as followed by your repo. When you git/pull -f, tho

Re: [9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread ron minnich
aster <-- now it's rebased to the master >> >> Wouldn't that work for you here too? >> >> -Ben >> >> >> ------ >> *From:* Jacob Moody >> *Sent:* Friday, February 7, 2025 9:51 AM >> *To:* 9fan

Re: [9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread ron minnich
ant to rebase > git rebase master <-- now it's rebased to the master > > Wouldn't that work for you here too? > > -Ben > > > -- > *From:* Jacob Moody > *Sent:* Friday, February 7, 2025 9:51 AM > *To:* 9fans@9fans.net <9fans

Re: [9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread Ben Huntsman
out x<-- the local branch I want to rebase git rebase master <-- now it's rebased to the master Wouldn't that work for you here too? -Ben From: Jacob Moody Sent: Friday, February 7, 2025 9:51 AM To: 9fans@9fans.net <9fans@9fans.net> Subje

Re: [9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread Jacob Moody
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

[9fans] git/rebase for someone used to git pull --rebase

2025-02-07 Thread ron minnich
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 no