- First line: Imperative subject line (max. 50 chars)
- One free line
- Other relevant information, reasoning, explanations, etc.
- When the server has changes unrelated to yours:
git pull --rebase
- Make this the default:
git config --bool pull.rebase true
- In this case,
git pull --merge can be used to restore previous behavior.
- When the server has changes and you do not:
git pull --ff-only
git pull (Works always, but sometimes not as pretty)
git reset --soft HEAD^ moves changes from the last commit back to the index so that they can be edited.
- Follow up with
git commit -c ORIG_HEAD to re-commit afterwards.