News for hackers. Stuff that matters.
Re:Git is too hard by kernelbugs on Tuesday November 17, 2020 @11:11AM (#25125410)
Could you not perhaps git fetch && git rebase origin/master (for instance, to pull remote changes into a local development branch)?
Re:Git is too hard by simiones on Tuesday November 17, 2020 @11:36AM (#25125742)
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.
Re:Git is too hard by simfoo on Tuesday November 17, 2020 @12:24PM (#25126495)

    git config rebase.autoStash true
Re:Git is too hard by renox on Wednesday November 18, 2020 @11:08PM (#25146137)
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.
Re:Git is too hard by simfoo on Thursday November 19, 2020 @09:04AM (#25149534)
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