don't forget autostash alias gupa="git pull --rebase --autostash"
[deleted]
Never* use Git pull [video]
11–20 of 22 posts
Re: Never* use Git pull [video]
#12Finally someone can explain something in an understandable way. This guy should be an educator.
Re: Never* use Git pull [video]
#13I've not used "git pull" since 2010. I always "git fetch" remote objects, and rebase with an explicit "git rebase".
Isn't that what "git pull --rebase" does?
Re: Never* use Git pull [video]
#14Re: Never* use Git pull [video]
#15I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.
> How often are you pulling from a shared branch that you are making local commits to? Every working/hobbying day for the past decade and a half.
Got a chuckle from this one
Re: Never* use Git pull [video]
#16I feel like this is "solving" a problem that doesn't exist in good workflows. How often are you pulling from a shared branch that you are making local commits to? Each of the people in the video should be branching off main and doing pull requests to get back into main.
Like anyone gives a raccoon's ass about what they "should" be doing.
Re: Never* use Git pull [video]
#17don't forget autostash alias gupa="git pull --rebase --autostash"
whoa, autostash is brilliant
Re: Never* use Git pull [video]
#18don't forget autostash alias gupa="git pull --rebase --autostash"
I think that at the point in the workflow where you are ready to get some new changes from upstream and integrate with your local ones, you're probably going to have all your outstanding work in a commit.
A rebase that is part of a pull, together with auto-stash, doesn't make a whole lot of sense.
I've never run into the problem of not being able to rebase due to uncommitted changes, except in two situations:
- suddenly wanting to rewrite something in the branch, unrelated to the in-progress work.
- working in a badly structured project whose builds alter tracked files
Re: Never* use Git pull [video]
#19Earlier quoted context omitted.
Isn't that what "git pull --rebase" does?
I've had it enabled by default for years and years. It's always what I want. [pull] rebase = true
I did that for several months in 2010. It's too error prone; you will forget to have that configured somewhere and get a merge by mistake.
So then I trained myself on "pull --rebase". I soon realized, I don't want to be combining fetch and rebase. The best way was to just scrub the pull command from the vocabulary.
Re: Never* use Git pull [video]
#20I've not used "git pull" since 2010. I always "git fetch" remote objects, and rebase with an explicit "git rebase".
Isn't that what "git pull --rebase" does?
I don't rebase immediately after a git fetch. I look at what is new first. I might not rebase over all of it. E.g. the first three commits may have something I need to pick up, but then after that there may be something I don't want to integrate with yet.