5 ms·
git config pull.rebase true git config rebase.autoStash true I think these should have been the defaults but they weren't implemented until later and it's
by modeless 6y ago
git config pull.rebase true
git config rebase.autoStash true
I think these should have been the defaults but they weren't implemented until later and it's hard to change defaults.
- zyberzero 6y agoTIL. Thank you for this!
- lordgrenville 6y agoGreat to know about these. I still think the current default is better: for a new user, it might be scary for your uncommitted changes to "vanish" into a stash.
- modeless 6y agoThe stash is popped before the command finishes, so your changes don't appear to vanish. Unless there's a conflict while rebasing a prior commit. Actually I'm not sure if aborting the rebase at that point would pop the autostash, but it should.
- lordgrenville 6y agoGot it. In that case I agree.
- hiyer 6y agoSetting rebase to true by default is not a good idea if you push your code to your dev branch regularly (rather than just committing).
- teraflop 6y agoI think that's a bit of an exaggeration; "pull.rebase=true" should be fine as long as you don't have local merge commits that need to be rebased on top of someone else's changes. With ordinary commits, it shouldn't really matter how frequently you (or others) push.