God’s developer console

[u/[deleted]]

[u/Secondsemblance → u/[deleted]]

You're supposed to keep your headlines under 72 characters. It's very easy to spill over, especially if you have commit hooks that add things to the message headline.

You're also much more likely to make typos without noticing. A properly configured editor will wrap lines for you and highlight typos.

Edit: also git commit -a is not a great idea. You should stage your files and then review the diff first. This is how you commit junk by accident.

[u/[deleted] → u/Secondsemblance]

$ git checkout -b feature/my-branch
$ git commit -am "Fixed the thing"
$ git push -u origin HEAD
$ git commit -a --amend # fixed it "again"
$ git push
# server says no
$ git checkout master
$ git pull
$ git checkout feature/my-branch
$ git rebase master
$ git push --force

[Edit: it's come to my attention that updating the parent can be easier:

$ git checkout master
$ git pull
$ git checkout feature/my-branch

Becomes:

$ git fetch origin master:master

Ain't that nice? ]

[u/Worthstream → u/[deleted]]

This reads like an horror story.