3 ms·

Could you not perhaps git fetch && git rebase origin/master (for instance, to pull remote changes into a local development branch)?

• simiones 6y ago
  git fetch && git rebase origin/master, which is equivalent to git pull --rebase origin master, requires your worktree to be clean, so you must either commit or stash if you have any local changes.
  • simfoo 6y ago
    git config rebase.autoStash true
    • renox 6y ago
      I think that's a very good way to have a long list of things stashed that you don't remember what they are. Commiting your changes is much better as you can add an explanation for your futur self.
      • simfoo 6y ago
        Well it does auto-pop the stash as well if the rebase was successful. I've been using it for ages and never noticed a growing stash
  • deleted 6y ago
    [deleted]