Re: Git question: Rebasing a user branch

2020-02-04 Thread Richard Earnshaw
On 04/02/2020 23:26, Bill Schmidt wrote: > On 2/4/20 5:09 PM, Andreas Schwab wrote: >> On Feb 04 2020, Bill Schmidt wrote: >> >>> Hm.  If I'm understanding you correctly, this still attempts to create a >>> new branch: >>> >>> wschmidt@marlin:~/newgcc/gcc/config/rs6000$ git push --dry-run >>> users

Re: Git question: Rebasing a user branch

2020-02-04 Thread Bill Schmidt
On 2/4/20 5:09 PM, Andreas Schwab wrote: On Feb 04 2020, Bill Schmidt wrote: Hm.  If I'm understanding you correctly, this still attempts to create a new branch: wschmidt@marlin:~/newgcc/gcc/config/rs6000$ git push --dry-run users/wschmidt +wschmidt/builtins:users/wschmidt/builtins Sorry, tha

Re: Git question: Rebasing a user branch

2020-02-04 Thread Andreas Schwab
On Feb 04 2020, Bill Schmidt wrote: > Looks fine to me, so lets try the force push: > > wschmidt@marlin:~/newgcc/gcc/config/rs6000$ git push --dry-run > users/wschmidt +wschmidt/builtins It looks like the leading + on the refspec suppresses matching against the default push refspec. I think that

Re: Git question: Rebasing a user branch

2020-02-04 Thread Andreas Schwab
On Feb 04 2020, Bill Schmidt wrote: > Hm.  If I'm understanding you correctly, this still attempts to create a > new branch: > > wschmidt@marlin:~/newgcc/gcc/config/rs6000$ git push --dry-run > users/wschmidt +wschmidt/builtins:users/wschmidt/builtins Sorry, that needs to be fully qualified, as i

Re: Git question: Rebasing a user branch

2020-02-04 Thread Bill Schmidt
On 2/4/20 4:31 PM, Andreas Schwab wrote: On Feb 04 2020, Bill Schmidt wrote: wschmidt@marlin:~/newgcc/gcc/config/rs6000$ git push --dry-run users/wschmidt +wschmidt/builtins To git+ssh://gcc.gnu.org/git/gcc.git  * [new branch]  wschmidt/builtins -> wschmidt/builtins Well, that's o

Re: Git question: Rebasing a user branch

2020-02-04 Thread Andreas Schwab
On Feb 04 2020, Bill Schmidt wrote: > wschmidt@marlin:~/newgcc/gcc/config/rs6000$ git push --dry-run > users/wschmidt +wschmidt/builtins > To git+ssh://gcc.gnu.org/git/gcc.git >  * [new branch]  wschmidt/builtins -> wschmidt/builtins > > Well, that's odd, why is it trying to create a n

Re: Git question: Rebasing a user branch

2020-02-04 Thread Nicholas Krause
On 2/4/20 5:02 PM, Bill Schmidt wrote: I'm having a little difficulty with my workflow, and I'm hoping someone can spot the problem. I have a user branch set up with the contrib/git-add-user-branch.sh script.  Here are the relevant portions of my .git/config: [remote "users/wschmidt"]    

Re: Git question: Rebasing a user branch

2020-02-04 Thread H.J. Lu
On Tue, Feb 4, 2020 at 2:03 PM Bill Schmidt wrote: > > I'm having a little difficulty with my workflow, and I'm hoping someone > can spot the problem. > > I have a user branch set up with the contrib/git-add-user-branch.sh > script. Here are the relevant portions of my .git/config: > > [remote "u

Git question: Rebasing a user branch

2020-02-04 Thread Bill Schmidt
I'm having a little difficulty with my workflow, and I'm hoping someone can spot the problem. I have a user branch set up with the contrib/git-add-user-branch.sh script.  Here are the relevant portions of my .git/config: [remote "users/wschmidt"]     url = git+ssh://wschm...@gcc.gnu.org/g